Merge pull request #30417 from yujuhong/source_ready

Automatic merge from submit-queue kubelet: mark source ready after updating the cache This ensures that cleanup routines don't start until the cache content is up-to-date.  --- 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/30417)

Merge pull request #30417 from yujuhong/source_ready
7c7acbe1 · Kubernetes Submit Queue · GitHub · 53331f7a · 8e48221c · 7c7acbe1
Commit 7c7acbe1 authored Aug 11, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 11, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

kubelet.go pkg/kubelet/kubelet.go +8 -1

No files found.
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -2175,7 +2175,6 @@ func (kl *Kubelet) syncLoopIteration(configCh <-chan kubetypes.PodUpdate, handle
 			glog.Errorf("Update channel is closed. Exiting the sync loop.")
 			return false
 		}
-		kl.sourcesReady.AddSource(u.Source)

 		switch u.Op {
 		case kubetypes.ADD:
@@ -2202,6 +2201,14 @@ func (kl *Kubelet) syncLoopIteration(configCh <-chan kubetypes.PodUpdate, handle
 			// TODO: Do we want to support this?
 			glog.Errorf("Kubelet does not support snapshot update")
 		}
+
+		// Mark the source ready after receiving at least one update from the
+		// source. Once all the sources are marked ready, various cleanup
+		// routines will start reclaiming resources. It is important that this
+		// takes place only after kubelet calls the update handler to process
+		// the update to ensure the internal pod cache is up-to-date.
+		kl.sourcesReady.AddSource(u.Source)
+
 	case e := <-plegCh:
 		if isSyncPodWorthy(e) {
 			// PLEG event for a pod; sync it.