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

Use /proc/net/nf_conntrack.

Browse Source 
/proc/net/ip_conntrack was finally removed from linux 4.9 onwards,
instead we should use /proc/net/nf_conntrack (see commit message at
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=adf0516845bcd0e626323c858ece28ee58c74455)

Signed-off-by: Chris Glass <chris.glass@canonical.com>
This commit is contained in:
Chris Glass 2018-01-05 14:17:39 +01:00
parent 411881803f
commit a2a0b9cd0f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/network/kube_proxy.go
View File

@ -171,19 +171,19 @@ var _ = SIGDescribe("Network", func() {
// If test flakes occur here, then this check should be performed // If test flakes occur here, then this check should be performed
// in a loop as there may be a race with the client connecting. // in a loop as there may be a race with the client connecting.
framework.IssueSSHCommandWithResult( framework.IssueSSHCommandWithResult(
fmt.Sprintf("sudo cat /proc/net/ip_conntrack | grep 'dport=%v'", fmt.Sprintf("sudo cat /proc/net/nf_conntrack | grep 'dport=%v'",
testDaemonTcpPort), testDaemonTcpPort),
framework.TestContext.Provider, framework.TestContext.Provider,
clientNodeInfo.node) clientNodeInfo.node)
// Timeout in seconds is available as the third column from // Timeout in seconds is available as the fifth column from
// /proc/net/ip_conntrack. // /proc/net/nf_conntrack.
result, err := framework.IssueSSHCommandWithResult( result, err := framework.IssueSSHCommandWithResult(
fmt.Sprintf( fmt.Sprintf(
"sudo cat /proc/net/ip_conntrack "+ "sudo cat /proc/net/nf_conntrack "+
"| grep 'CLOSE_WAIT.*dst=%v.*dport=%v' "+ "| grep 'CLOSE_WAIT.*dst=%v.*dport=%v' "+
"| tail -n 1"+ "| tail -n 1"+
"| awk '{print $3}' ", "| awk '{print $5}' ",
serverNodeInfo.nodeIp, serverNodeInfo.nodeIp,
testDaemonTcpPort), testDaemonTcpPort),
framework.TestContext.Provider, framework.TestContext.Provider,