github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #32280 from wojtek-t/fix_scalability_failure 

Automatic merge from submit-queue

Fix allow for non-ready nodes in e2e framework

Ref #32257
pull/6/head
Kubernetes Submit Queue 2016-09-08 06:21:23 -07:00 committed by GitHub
parent 54243d4f1b e750454c31
commit 456c78a806
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/storage/cacher.go
View File

@ -650,7 +650,8 @@ func (c *cacheWatcher) add(event watchCacheEvent) {
c.forget(false) c.forget(false)
c.stop() 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) { func (c *cacheWatcher) sendWatchCacheEvent(event watchCacheEvent) {

4
test/e2e/framework/util.go
View File

@ -4201,7 +4201,7 @@ func allowedNotReadyReasons(nodes []*api.Node) bool {
for _, node := range nodes { for _, node := range nodes {
index, condition := api.GetNodeCondition(&node.Status, api.NodeReady) index, condition := api.GetNodeCondition(&node.Status, api.NodeReady)
if index == -1 || 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 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 // and figure out how to do it in a configurable way, as we can't expect all setups to run
// default test add-ons. // default test add-ons.
func AllNodesReady(c *client.Client, timeout time.Duration) error { 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 var notReady []*api.Node
err := wait.PollImmediate(Poll, timeout, func() (bool, error) { err := wait.PollImmediate(Poll, timeout, func() (bool, error) {