Merge pull request #32079 from gmarek/load

Add a log to help debug #31981
kubernetes · Sep 5, 2016 · 9767c26 · 9767c26
2 parents ab0b937 + a82e542
commit 9767c26
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkg/controller/replication/replication_controller.go b/pkg/controller/replication/replication_controller.go
@@ -319,6 +319,8 @@ func (rm *ReplicationManager) updateRC(old, cur interface{}) {
 	if !reflect.DeepEqual(oldRC.Spec.Selector, curRC.Spec.Selector) {
 		rm.lookupCache.InvalidateAll()
 	}
+	// TODO: Remove when #31981 is resolved!
+	glog.Infof("Observed updated replication controller %v. Pod count change: %d->%d", curRC.Name, oldRC.Status.Replicas, curRC.Status.Replicas)
 
 	// You might imagine that we only really need to enqueue the
 	// controller when Spec changes, but it is safer to sync any

diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go
@@ -3367,7 +3367,7 @@ func DeleteRCAndWaitForGC(c *client.Client, ns, name string) error {
 	if rc.Spec.Replicas < 5000 {
 		timeout = 10 * time.Minute
 	} else {
-		timeout = time.Duration(rc.Spec.Replicas / gcThroughput) * time.Second
+		timeout = time.Duration(rc.Spec.Replicas/gcThroughput) * time.Second
 	}
 	err = waitForPodsInactive(ps, interval, timeout)
 	if err != nil {