github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 14:11:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11008 from krousey/nodesflake

Browse Source 
Adding polling to all node readiness
This commit is contained in:
Victor Marmol
2015-07-09 14:23:29 -07:00
parent fb204173e8 3058ddad19
commit fbc6e7f5f5
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/framework.go
View File

@@ -18,6 +18,7 @@ package e2e
import ( import (
"fmt" "fmt"
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client" "github.com/GoogleCloudPlatform/kubernetes/pkg/client"
@@ -86,7 +87,7 @@ func (f *Framework) afterEach() {
} }
// Check whether all nodes are ready after the test. // Check whether all nodes are ready after the test.
if err := allNodesReady(f.Client); err != nil { if err := allNodesReady(f.Client, time.Minute); err != nil {
Failf("All nodes should be ready after test, %v", err) Failf("All nodes should be ready after test, %v", err)
} }

2
test/e2e/resize_nodes.go
View File

@@ -413,7 +413,7 @@ var _ = Describe("Nodes", func() {
AfterEach(func() { AfterEach(func() {
By("checking whether all nodes are healthy") By("checking whether all nodes are healthy")
if err := allNodesReady(c); err != nil { if err := allNodesReady(c, time.Minute); err != nil {
Failf("Not all nodes are ready: %v", err) Failf("Not all nodes are ready: %v", err)
} }
By(fmt.Sprintf("destroying namespace for this suite %s", ns)) By(fmt.Sprintf("destroying namespace for this suite %s", ns))

30
test/e2e/util.go
View File

@@ -1434,8 +1434,9 @@ func waitForNodeToBeNotReady(c *client.Client, name string, timeout time.Duratio
func isNodeReadySetAsExpected(node *api.Node, wantReady bool) bool { func isNodeReadySetAsExpected(node *api.Node, wantReady bool) bool {
// Check the node readiness condition (logging all). // Check the node readiness condition (logging all).
for i, cond := range node.Status.Conditions { for i, cond := range node.Status.Conditions {
Logf("Node %s condition %d/%d: type: %v, status: %v", Logf("Node %s condition %d/%d: type: %v, status: %v, reason: %q, message: %q, last transistion time: %v",
node.Name, i+1, len(node.Status.Conditions), cond.Type, cond.Status) node.Name, i+1, len(node.Status.Conditions), cond.Type, cond.Status,
cond.Reason, cond.Message, cond.LastTransitionTime)
// Ensure that the condition type is readiness and the status // Ensure that the condition type is readiness and the status
// matches as desired. // matches as desired.
if cond.Type == api.NodeReady && (cond.Status == api.ConditionTrue) == wantReady { if cond.Type == api.NodeReady && (cond.Status == api.ConditionTrue) == wantReady {
@@ -1468,15 +1469,28 @@ func waitForNodeToBe(c *client.Client, name string, wantReady bool, timeout time
} }
// checks whether all registered nodes are ready // checks whether all registered nodes are ready
func allNodesReady(c *client.Client) error { func allNodesReady(c *client.Client, timeout time.Duration) error {
nodes, err := c.Nodes().List(labels.Everything(), fields.Everything()) Logf("Waiting up to %v for all nodes to be ready", timeout)
Expect(err).NotTo(HaveOccurred())
var notReady []api.Node var notReady []api.Node
for _, node := range nodes.Items { err := wait.Poll(poll, timeout, func() (bool, error) {
if isNodeReadySetAsExpected(&node, false) { notReady = nil
notReady = append(notReady, node) nodes, err := c.Nodes().List(labels.Everything(), fields.Everything())
if err != nil {
return false, err
} }
for _, node := range nodes.Items {
if !isNodeReadySetAsExpected(&node, true) {
notReady = append(notReady, node)
}
}
return len(notReady) == 0, nil
})
if err != nil && err != wait.ErrWaitTimeout {
return err
} }
if len(notReady) > 0 { if len(notReady) > 0 {
return fmt.Errorf("Not ready nodes: %v", notReady) return fmt.Errorf("Not ready nodes: %v", notReady)
} }