From 1504c7fc31d1a1f8a37e106b056cc261cdff7a47 Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Fri, 2 Jun 2017 14:34:24 +0200 Subject: [PATCH] Add logging to debug conflicts in kubemark-scale test --- staging/src/k8s.io/apiserver/pkg/storage/cacher.go | 5 +++++ staging/src/k8s.io/apiserver/pkg/storage/time_budget.go | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher.go index ac5e0160822..157bf5bcd82 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/cacher.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher.go @@ -639,6 +639,11 @@ func forgetWatcher(c *Cacher, index int, triggerValue string, triggerSupported b if lock { c.Lock() defer c.Unlock() + } else { + // false is currently passed only if we are forcing watcher to close due + // to its unresponsiveness and blocking other watchers. + // TODO: Get this information in cleaner way. + glog.V(1).Infof("Forcing watcher close due to unresponsiveness: %v", c.objectType.String()) } // It's possible that the watcher is already not in the structure (e.g. in case of // simulaneous Stop() and terminateAllWatchers(), but it doesn't break anything. diff --git a/staging/src/k8s.io/apiserver/pkg/storage/time_budget.go b/staging/src/k8s.io/apiserver/pkg/storage/time_budget.go index 0febb794b90..e619ec66054 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/time_budget.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/time_budget.go @@ -23,7 +23,7 @@ import ( const ( refreshPerSecond = 50 * time.Millisecond - maxBudget = 250 * time.Millisecond + maxBudget = 100 * time.Millisecond ) // timeBudget implements a budget of time that you can use and is