mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #37236 from bowei/flake-kube-proxy
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:
commit
4dd0320db7
@ -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",
|
||||||
|
Loading…
Reference in New Issue
Block a user