From a82e54262df1de0ab0a554ff896a0af634b10c95 Mon Sep 17 00:00:00 2001 From: gmarek Date: Mon, 5 Sep 2016 14:28:12 +0200 Subject: [PATCH] Add a log to help debug #31981 --- pkg/controller/replication/replication_controller.go | 2 ++ test/e2e/framework/util.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/controller/replication/replication_controller.go b/pkg/controller/replication/replication_controller.go index 511c5d9261..77cbde0761 100644 --- 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 index 403247921b..0178dc507c 100644 --- 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 {