github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32379 from wojtek-t/allow_for_notready_nodes_in_scalability

Browse Source 
Automatic merge from submit-queue

Allow for not-ready nodes in WaitForAllNodesSchedulable

Ref #31215
This commit is contained in:
Kubernetes Submit Queue 2016-09-09 06:47:36 -07:00 committed by GitHub
commit cd30526b44
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2952,7 +2952,11 @@ func GetReadySchedulableNodesOrDie(c *client.Client) (nodes *api.NodeList) {
} }
func WaitForAllNodesSchedulable(c *client.Client) error { func WaitForAllNodesSchedulable(c *client.Client) error {
Logf("Waiting up to %v for all (but %d) nodes to be schedulable", 4*time.Hour, TestContext.AllowedNotReadyNodes)
var notSchedulable []*api.Node
return wait.PollImmediate(30*time.Second, 4*time.Hour, func() (bool, error) { return wait.PollImmediate(30*time.Second, 4*time.Hour, func() (bool, error) {
notSchedulable = nil
opts := api.ListOptions{ opts := api.ListOptions{
ResourceVersion: "0", ResourceVersion: "0",
FieldSelector: fields.Set{"spec.unschedulable": "false"}.AsSelector(), FieldSelector: fields.Set{"spec.unschedulable": "false"}.AsSelector(),
@ -2963,17 +2967,23 @@ func WaitForAllNodesSchedulable(c *client.Client) error {
// Ignore the error here - it will be retried. // Ignore the error here - it will be retried.
return false, nil return false, nil
} }
schedulable := 0 for i := range nodes.Items {
for _, node := range nodes.Items { node := &nodes.Items[i]
if isNodeSchedulable(&node) { if !isNodeSchedulable(node) {
schedulable++ notSchedulable = append(notSchedulable, node)
} }
} }
if schedulable != len(nodes.Items) { // Framework allows for <TestContext.AllowedNotReadyNodes> nodes to be non-ready,
Logf("%d/%d nodes schedulable (polling after 30s)", schedulable, len(nodes.Items)) // to make it possible e.g. for incorrect deployment of some small percentage
// of nodes (which we allow in cluster validation). Some nodes that are not
// provisioned correctly at startup will never become ready (e.g. when something
// won't install correctly), so we can't expect them to be ready at any point.
//
// However, we only allow non-ready nodes with some specific reasons.
if len(notSchedulable) > TestContext.AllowedNotReadyNodes {
return false, nil return false, nil
} }
return true, nil return allowedNotReadyReasons(notSchedulable), nil
}) })
} }