Merge pull request #31231 from mwielgus/rs-fix3

Automatic merge from submit-queue Test if 2 federated informers in rs controller are in sync cc: @quinton-hoole @kubernetes/sig-cluster-federation

Merge pull request #31231 from mwielgus/rs-fix3
d6fb8b06 · Kubernetes Submit Queue · GitHub · 9484b2c0 · 7d1c85e4 · d6fb8b06
Commit d6fb8b06 authored Aug 23, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 23, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 0 deletions

replicasetcontroller.go .../federation-controller/replicaset/replicasetcontroller.go +11 -0

No files found.
--- a/federation/pkg/federation-controller/replicaset/replicasetcontroller.go
+++ b/federation/pkg/federation-controller/replicaset/replicasetcontroller.go
@@ -226,9 +226,20 @@ func (frsc *ReplicaSetController) isSynced() bool {
 		glog.V(2).Infof("Cluster list not synced")
 		return false
 	}
+	clusters2, err := frsc.fedPodInformer.GetReadyClusters()
+	if err != nil {
+		glog.Errorf("Failed to get ready clusters: %v", err)
+		return false
+	}
+
+	// This also checks whether podInformer and replicaSetInformer have the
+	// same cluster lists.
 	if !frsc.fedPodInformer.GetTargetStore().ClustersSynced(clusters) {
 		return false
 	}
+	if !frsc.fedPodInformer.GetTargetStore().ClustersSynced(clusters2) {
+		return false
+	}

 	if !frsc.replicaSetController.HasSynced() {
 		glog.V(2).Infof("federation replicaset list not synced")