scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38609 from wojtek-t/cleanup_annoying_test_logs

Browse Source 
Automatic merge from submit-queue

Reduce amount of annoing logs in large clusters
This commit is contained in:
Kubernetes Submit Queue
2016-12-13 02:12:07 -08:00
committed by GitHub
parent ad1c60da71 ebdef4d57e
commit 99f876bb78
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,6 +171,9 @@ const (
// GC issues 2 requestes for single delete. // GC issues 2 requestes for single delete.
gcThroughput = 10 gcThroughput = 10
// Minimal number of nodes for the cluster to be considered large.
largeClusterThreshold = 100
// TODO(justinsb): Avoid hardcoding this. // TODO(justinsb): Avoid hardcoding this.
awsMasterIP = "172.20.0.9" awsMasterIP = "172.20.0.9"
@@ -2435,7 +2438,9 @@ func WaitForAllNodesSchedulable(c clientset.Interface, timeout time.Duration) er
Logf("Waiting up to %v for all (but %d) nodes to be schedulable", timeout, TestContext.AllowedNotReadyNodes) Logf("Waiting up to %v for all (but %d) nodes to be schedulable", timeout, TestContext.AllowedNotReadyNodes)
var notSchedulable []*v1.Node var notSchedulable []*v1.Node
attempt := 0
return wait.PollImmediate(30*time.Second, timeout, func() (bool, error) { return wait.PollImmediate(30*time.Second, timeout, func() (bool, error) {
attempt++
notSchedulable = nil notSchedulable = nil
opts := v1.ListOptions{ opts := v1.ListOptions{
ResourceVersion: "0", ResourceVersion: "0",
@@ -2461,12 +2466,16 @@ func WaitForAllNodesSchedulable(c clientset.Interface, timeout time.Duration) er
// //
// However, we only allow non-ready nodes with some specific reasons. // However, we only allow non-ready nodes with some specific reasons.
if len(notSchedulable) > 0 { if len(notSchedulable) > 0 {
Logf("Unschedulable nodes:") // In large clusters, log them only every 10th pass.
for i := range notSchedulable { if len(nodes.Items) >= largeClusterThreshold && attempt%10 == 0 {
Logf("-> %s Ready=%t Network=%t", Logf("Unschedulable nodes:")
notSchedulable[i].Name, for i := range notSchedulable {
IsNodeConditionSetAsExpected(notSchedulable[i], v1.NodeReady, true), Logf("-> %s Ready=%t Network=%t",
IsNodeConditionSetAsExpected(notSchedulable[i], v1.NodeNetworkUnavailable, false)) notSchedulable[i].Name,
IsNodeConditionSetAsExpectedSilent(notSchedulable[i], v1.NodeReady, true),
IsNodeConditionSetAsExpectedSilent(notSchedulable[i], v1.NodeNetworkUnavailable, false))
}
Logf("================================")
} }
} }
if len(notSchedulable) > TestContext.AllowedNotReadyNodes { if len(notSchedulable) > TestContext.AllowedNotReadyNodes {