Merge pull request #32280 from wojtek-t/fix_scalability_failure

pkg/storage/cacher.go

@@ -650,7 +650,8 @@ func (c *cacheWatcher) add(event watchCacheEvent) {
 		c.forget(false)
 		c.stop()
 	}
-	glog.V(2).Infof("cacheWatcher add function blocked processing for %v", time.Since(startTime))
+	glog.V(2).Infof("cacheWatcher add function blocked processing of %v for %v",
+		reflect.TypeOf(event.Object).String(), time.Since(startTime))
 }
 
 func (c *cacheWatcher) sendWatchCacheEvent(event watchCacheEvent) {

test/e2e/framework/util.go

@@ -4201,7 +4201,7 @@ func allowedNotReadyReasons(nodes []*api.Node) bool {
 	for _, node := range nodes {
 		index, condition := api.GetNodeCondition(&node.Status, api.NodeReady)
 		if index == -1 ||
-			!strings.Contains(condition.Reason, "could not locate kubenet required CNI plugins") {
+			!strings.Contains(condition.Message, "could not locate kubenet required CNI plugins") {
 			return false
 		}
 	}
@@ -4213,7 +4213,7 @@ func allowedNotReadyReasons(nodes []*api.Node) bool {
 // and figure out how to do it in a configurable way, as we can't expect all setups to run
 // default test add-ons.
 func AllNodesReady(c *client.Client, timeout time.Duration) error {
-	Logf("Waiting up to %v for all nodes to be ready", timeout)
+	Logf("Waiting up to %v for all (but %d) nodes to be ready", TestContext.AllowedNotReadyNodes, timeout)
 
 	var notReady []*api.Node
 	err := wait.PollImmediate(Poll, timeout, func() (bool, error) {