Merge pull request #46855 from wojtek-t/log_broken_watches

Automatic merge from submit-queue

Add logging to debug conflicts in kubemark-scale test

Ref #46851

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.

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