Merge pull request #29562 from saad-ali/automated-cherry-pick-of-#290…

…77-upstream-release-1.3 Automated cherry pick of #29077 upstream release 1.3
kubernetes · Jul 26, 2016 · b4d5f59 · b4d5f59
2 parents 74e738c + 08c5026
commit b4d5f59
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/pkg/controller/volume/attach_detach_controller.go b/pkg/controller/volume/attach_detach_controller.go
@@ -54,7 +54,7 @@ const (
 
 	// desiredStateOfWorldPopulatorLoopSleepPeriod is the amount of time the
 	// DesiredStateOfWorldPopulator loop waits between successive executions
-	desiredStateOfWorldPopulatorLoopSleepPeriod time.Duration = 5 * time.Minute
+	desiredStateOfWorldPopulatorLoopSleepPeriod time.Duration = 1 * time.Minute
 )
 
 // AttachDetachController defines the operations supported by this controller.

diff --git a/pkg/controller/volume/populator/desired_state_of_world_populator.go b/pkg/controller/volume/populator/desired_state_of_world_populator.go
@@ -82,28 +82,42 @@ func (dswp *desiredStateOfWorldPopulator) findAndRemoveDeletedPods() {
 			glog.Errorf("MetaNamespaceKeyFunc failed for pod %q (UID %q) with: %v", dswPodKey, dswPodUID, err)
 			continue
 		}
-		// retrieve the pod object from pod informer with the namespace key
-		informerPodObj, exists, err := dswp.podInformer.GetStore().GetByKey(dswPodKey)
-		if err != nil || informerPodObj == nil {
-			glog.Errorf("podInformer GetByKey failed for pod %q (UID %q) with %v", dswPodKey, dswPodUID, err)
+
+		// Retrieve the pod object from pod informer with the namespace key
+		informerPodObj, exists, err :=
+			dswp.podInformer.GetStore().GetByKey(dswPodKey)
+		if err != nil {
+			glog.Errorf(
+				"podInformer GetByKey failed for pod %q (UID %q) with %v",
+				dswPodKey,
+				dswPodUID,
+				err)
 			continue
 		}
+		if exists && informerPodObj == nil {
+			glog.Info(
+				"podInformer GetByKey found pod, but informerPodObj is nil for pod %q (UID %q)",
+				dswPodKey,
+				dswPodUID)
+			continue
+		}
+
 		if exists {
 			informerPod, ok := informerPodObj.(*api.Pod)
 			if !ok {
 				glog.Errorf("Failed to cast obj %#v to pod object for pod %q (UID %q)", informerPod, dswPodKey, dswPodUID)
 				continue
 			}
 			informerPodUID := volumehelper.GetUniquePodName(informerPod)
-			// Check whether the unique idenfier of the pod from dsw matches the one retrived from pod informer
+			// Check whether the unique identifier of the pod from dsw matches the one retrieved from pod informer
 			if informerPodUID == dswPodUID {
 				glog.V(10).Infof(
 					"Verified pod %q (UID %q) from dsw exists in pod informer.", dswPodKey, dswPodUID)
 				continue
 
 			}
 		}
-		// the pod from dsw does not exist in pod informer, or it does not match the unique idenfier retrieved
+		// the pod from dsw does not exist in pod informer, or it does not match the unique identifer retrieved
 		// from the informer, delete it from dsw
 		glog.V(1).Infof(
 			"Removing pod %q (UID %q) from dsw because it does not exist in pod informer.", dswPodKey, dswPodUID)