github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37236 from bowei/flake-kube-proxy

Browse Source 
Automatic merge from submit-queue

Update the timeout in CLOSE_WAIT e2e test

I see some test flakes due to the timeout being too strict,
updating to a larger value.

Adding tail -n 1, it looks like there may be leftover state for other
runs. We really only care about one of the CLOSE_WAIT entries.
This commit is contained in:
Kubernetes Submit Queue 2016-11-21 21:15:38 -08:00 committed by GitHub
commit 4dd0320db7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/kube_proxy.go
View File

@ -180,7 +180,8 @@ var _ = framework.KubeDescribe("Network", func() {
fmt.Sprintf( fmt.Sprintf(
"sudo cat /proc/net/ip_conntrack "+ "sudo cat /proc/net/ip_conntrack "+
"| grep 'CLOSE_WAIT.*dst=%v.*dport=%v' "+ "| grep 'CLOSE_WAIT.*dst=%v.*dport=%v' "+
"| awk '{print $3}'", "| tail -n 1"+
"| awk '{print $3}' ",
serverNodeInfo.nodeIp, serverNodeInfo.nodeIp,
testDaemonTcpPort), testDaemonTcpPort),
framework.TestContext.Provider, framework.TestContext.Provider,
@ -193,7 +194,7 @@ var _ = framework.KubeDescribe("Network", func() {
// These must be synchronized from the default values set in // These must be synchronized from the default values set in
// pkg/apis/../defaults.go ConntrackTCPCloseWaitTimeout. The // pkg/apis/../defaults.go ConntrackTCPCloseWaitTimeout. The
// current defaults are hidden in the initialization code. // current defaults are hidden in the initialization code.
const epsilonSeconds = 10 const epsilonSeconds = 60
const expectedTimeoutSeconds = 60 * 60 const expectedTimeoutSeconds = 60 * 60
framework.Logf("conntrack entry timeout was: %v, expected: %v", framework.Logf("conntrack entry timeout was: %v, expected: %v",