From dfe8e606c11b498e2a1bbeb9ae2a03b2a0f846b1 Mon Sep 17 00:00:00 2001
From: saadali <saadali@google.com>
Date: Wed, 22 Jun 2016 12:56:58 -0700
Subject: [PATCH] Fix device path used by volume WaitForAttach

---
 .../volume/statusupdater/node_status_updater.go      |  1 +
 .../util/operationexecutor/operation_executor.go     | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkg/controller/volume/statusupdater/node_status_updater.go b/pkg/controller/volume/statusupdater/node_status_updater.go
index 591ee074891..cf9d989b5fb 100644
--- a/pkg/controller/volume/statusupdater/node_status_updater.go
+++ b/pkg/controller/volume/statusupdater/node_status_updater.go
@@ -121,6 +121,7 @@ func (nsu *nodeStatusUpdater) UpdateNodeStatuses() error {
 
 		glog.V(3).Infof(
 			"Updating status for node %q succeeded. patchBytes: %q",
+			nodeName,
 			string(patchBytes))
 	}
 	return nil
diff --git a/pkg/volume/util/operationexecutor/operation_executor.go b/pkg/volume/util/operationexecutor/operation_executor.go
index f1c5fc44936..25b4fb3b165 100644
--- a/pkg/volume/util/operationexecutor/operation_executor.go
+++ b/pkg/volume/util/operationexecutor/operation_executor.go
@@ -575,11 +575,12 @@ func (oe *operationExecutor) generateMountVolumeFunc(
 		if volumeAttacher != nil {
 			// Wait for attachable volumes to finish attaching
 			glog.Infof(
-				"Entering MountVolume.WaitForAttach for volume %q (spec.Name: %q) pod %q (UID: %q).",
+				"Entering MountVolume.WaitForAttach for volume %q (spec.Name: %q) pod %q (UID: %q) DevicePath: %q",
 				volumeToMount.VolumeName,
 				volumeToMount.VolumeSpec.Name(),
 				volumeToMount.PodName,
-				volumeToMount.Pod.UID)
+				volumeToMount.Pod.UID,
+				volumeToMount.DevicePath)
 
 			devicePath, err := volumeAttacher.WaitForAttach(
 				volumeToMount.VolumeSpec, volumeToMount.DevicePath, waitForAttachTimeout)
@@ -889,12 +890,13 @@ func (oe *operationExecutor) generateVerifyControllerAttachedVolumeFunc(
 		for _, attachedVolume := range node.Status.VolumesAttached {
 			if attachedVolume.Name == volumeToMount.VolumeName {
 				addVolumeNodeErr := actualStateOfWorld.MarkVolumeAsAttached(
-					volumeToMount.VolumeSpec, nodeName, volumeToMount.DevicePath)
-				glog.Infof("Controller successfully attached volume %q (spec.Name: %q) pod %q (UID: %q)",
+					volumeToMount.VolumeSpec, nodeName, attachedVolume.DevicePath)
+				glog.Infof("Controller successfully attached volume %q (spec.Name: %q) pod %q (UID: %q) devicePath: %q",
 					volumeToMount.VolumeName,
 					volumeToMount.VolumeSpec.Name(),
 					volumeToMount.PodName,
-					volumeToMount.Pod.UID)
+					volumeToMount.Pod.UID,
+					attachedVolume.DevicePath)
 
 				if addVolumeNodeErr != nil {
 					// On failure, return error. Caller will log and retry.