Merge pull request #36888 from linki/patch-1

Automatic merge from submit-queue (batch tested with PRs 36888, 38180, 38855, 38590) wrong pod reference in error message for volume attach timeout **What this PR does / why we need it**: when a disk mount times out you get the following error: ``` Warning FailedSync Error syncing pod, skipping: timeout expired waiting for volumes to attach/mount for pod "nginx"/"default". list of unattached/unmounted volumes=[data] ``` where the pod is referenced by "podname"/"namespace", but should be "namespace"/"podname". **Which issue this PR fixes** no issue number **Special notes for your reviewer**: untested :(

Merge pull request #36888 from linki/patch-1
1abb8498 · Kubernetes Submit Queue · GitHub · 953488e9 · 001e75ba · 1abb8498
Commit 1abb8498 authored Dec 20, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 20, 2016
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

volume_manager.go pkg/kubelet/volumemanager/volume_manager.go +1 -1

util_test.go pkg/volume/util_test.go +2 -2

No files found.
--- a/pkg/kubelet/volumemanager/volume_manager.go
+++ b/pkg/kubelet/volumemanager/volume_manager.go
@@ -357,8 +357,8 @@ func (vm *volumeManager) WaitForAttachAndMount(pod *v1.Pod) error {
 		return fmt.Errorf(
 			"timeout expired waiting for volumes to attach/mount for pod %q/%q. list of unattached/unmounted volumes=%v",
-			pod.Name,
 			pod.Namespace,
+			pod.Name,
 			unmountedVolumes)
 	}

--- a/pkg/volume/util_test.go
+++ b/pkg/volume/util_test.go
@@ -114,14 +114,14 @@ func TestRecyclerPod(t *testing.T) {
 				newPodEvent(watch.Added, "podRecyclerFailure", v1.PodPending, ""),
 				newEvent(v1.EventTypeNormal, "Successfully assigned recycler-for-podRecyclerFailure to 127.0.0.1"),
 				newEvent(v1.EventTypeWarning, "Unable to mount volumes for pod \"recycler-for-podRecyclerFailure_default(3c9809e5-347c-11e6-a79b-3c970e965218)\": timeout expired waiting for volumes to attach/mount"),
-				newEvent(v1.EventTypeWarning, "Error syncing pod, skipping: timeout expired waiting for volumes to attach/mount for pod \"recycler-for-podRecyclerFailure\"/\"default\". list of unattached/unmounted"),
+				newEvent(v1.EventTypeWarning, "Error syncing pod, skipping: timeout expired waiting for volumes to attach/mount for pod \"default\"/\"recycler-for-podRecyclerFailure\". list of unattached/unmounted"),
 				newPodEvent(watch.Modified, "podRecyclerFailure", v1.PodRunning, ""),
 				newPodEvent(watch.Modified, "podRecyclerFailure", v1.PodFailed, "Pod was active on the node longer than specified deadline"),
 			},
 			expectedEvents: []mockEvent{
 				{v1.EventTypeNormal, "Successfully assigned recycler-for-podRecyclerFailure to 127.0.0.1"},
 				{v1.EventTypeWarning, "Unable to mount volumes for pod \"recycler-for-podRecyclerFailure_default(3c9809e5-347c-11e6-a79b-3c970e965218)\": timeout expired waiting for volumes to attach/mount"},
-				{v1.EventTypeWarning, "Error syncing pod, skipping: timeout expired waiting for volumes to attach/mount for pod \"recycler-for-podRecyclerFailure\"/\"default\". list of unattached/unmounted"},
+				{v1.EventTypeWarning, "Error syncing pod, skipping: timeout expired waiting for volumes to attach/mount for pod \"default\"/\"recycler-for-podRecyclerFailure\". list of unattached/unmounted"},
 			},
 			expectedError: "Pod was active on the node longer than specified deadline",
 		},