Merge pull request #30325 from ronnielai/test1

Automatic merge from submit-queue Fixing a potential container deletion GC timing issue If pod manager is updated before all containers in a pod are deleted, the container clean up logic should still be triggered.  --- This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30325)

Merge pull request #30325 from ronnielai/test1
a9af8a56 · Kubernetes Submit Queue · GitHub · 74f214ce · 8ee2dc88 · a9af8a56
Commit a9af8a56 authored Aug 10, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 10, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

kubelet.go pkg/kubelet/kubelet.go +4 -5

No files found.
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -2205,14 +2205,13 @@ func (kl *Kubelet) syncLoopIteration(configCh <-chan kubetypes.PodUpdate, handle
 	case e := <-plegCh:
 		if isSyncPodWorthy(e) {
 			// PLEG event for a pod; sync it.
-			pod, ok := kl.podManager.GetPodByUID(e.ID)
-			if !ok {
+			if pod, ok := kl.podManager.GetPodByUID(e.ID); ok {
+				glog.V(2).Infof("SyncLoop (PLEG): %q, event: %#v", format.Pod(pod), e)
+				handler.HandlePodSyncs([]*api.Pod{pod})
+			} else {
 				// If the pod no longer exists, ignore the event.
 				glog.V(4).Infof("SyncLoop (PLEG): ignore irrelevant event: %#v", e)
-				break
 			}
-			glog.V(2).Infof("SyncLoop (PLEG): %q, event: %#v", format.Pod(pod), e)
-			handler.HandlePodSyncs([]*api.Pod{pod})
 		}

 		if e.Type == pleg.ContainerDied {