Merge pull request #94828 from aojea/sctpflake

Fix sctp job flakes
This commit is contained in:
Kubernetes Prow Robot 2020-09-28 18:29:25 -07:00 committed by GitHub
commit ac519b43bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3933,24 +3933,28 @@ var _ = SIGDescribe("SCTP [Feature:SCTP] [LinuxOnly]", func() {
err := cs.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), podName, metav1.DeleteOptions{}) err := cs.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), podName, metav1.DeleteOptions{})
framework.ExpectNoError(err, "failed to delete pod: %s in namespace: %s", podName, f.Namespace.Name) framework.ExpectNoError(err, "failed to delete pod: %s in namespace: %s", podName, f.Namespace.Name)
}() }()
// wait until host port manager syncs rules
ginkgo.By("dumping iptables rules on the node")
cmd = "sudo iptables-save" cmd = "sudo iptables-save"
if framework.TestContext.ClusterIsIPv6() {
cmd = "sudo ip6tables-save"
}
err = wait.PollImmediate(framework.Poll, framework.PollShortTimeout, func() (bool, error) {
framework.Logf("Executing cmd %q on node %v", cmd, node.Name) framework.Logf("Executing cmd %q on node %v", cmd, node.Name)
result, err := hostExec.IssueCommandWithResult(cmd, node) result, err := hostExec.IssueCommandWithResult(cmd, node)
if err != nil { if err != nil {
framework.Failf("Interrogation of iptables rules failed on node %v", node.Name) framework.Logf("Interrogation of iptables rules failed on node %v", node.Name)
return false, nil
} }
ginkgo.By("checking that iptables contains the necessary iptables rules")
found := false
for _, line := range strings.Split(result, "\n") { for _, line := range strings.Split(result, "\n") {
if strings.Contains(line, "-p sctp") && strings.Contains(line, "--dport 5060") { if strings.Contains(line, "-p sctp") && strings.Contains(line, "--dport 5060") {
found = true return true, nil
break
} }
} }
if !found { framework.Logf("retrying ... not hostport sctp iptables rules found on node %v", node.Name)
return false, nil
})
if err != nil {
framework.Failf("iptables rules are not set for a pod with sctp hostport") framework.Failf("iptables rules are not set for a pod with sctp hostport")
} }
ginkgo.By("validating sctp module is still not loaded") ginkgo.By("validating sctp module is still not loaded")
@ -3989,28 +3993,31 @@ var _ = SIGDescribe("SCTP [Feature:SCTP] [LinuxOnly]", func() {
err = e2enetwork.WaitForService(f.ClientSet, ns, serviceName, true, 5*time.Second, e2eservice.TestTimeout) err = e2enetwork.WaitForService(f.ClientSet, ns, serviceName, true, 5*time.Second, e2eservice.TestTimeout)
framework.ExpectNoError(err, fmt.Sprintf("error while waiting for service:%s err: %v", serviceName, err)) framework.ExpectNoError(err, fmt.Sprintf("error while waiting for service:%s err: %v", serviceName, err))
ginkgo.By("dumping iptables rules on a node")
hostExec := utils.NewHostExec(f) hostExec := utils.NewHostExec(f)
defer hostExec.Cleanup() defer hostExec.Cleanup()
node, err := e2enode.GetRandomReadySchedulableNode(cs) node, err := e2enode.GetRandomReadySchedulableNode(cs)
framework.ExpectNoError(err) framework.ExpectNoError(err)
cmd := "sudo iptables-save" cmd := "sudo iptables-save"
if framework.TestContext.ClusterIsIPv6() {
cmd = "sudo ip6tables-save"
}
err = wait.PollImmediate(framework.Poll, e2eservice.KubeProxyLagTimeout, func() (bool, error) {
framework.Logf("Executing cmd %q on node %v", cmd, node.Name) framework.Logf("Executing cmd %q on node %v", cmd, node.Name)
result, err := hostExec.IssueCommandWithResult(cmd, node) result, err := hostExec.IssueCommandWithResult(cmd, node)
if err != nil { if err != nil {
framework.Failf("Interrogation of iptables rules failed on node %v", node.Name) framework.Logf("Interrogation of iptables rules failed on node %v", node.Name)
return false, nil
} }
ginkgo.By("checking that iptables contains the necessary iptables rules")
kubeService := false
for _, line := range strings.Split(result, "\n") { for _, line := range strings.Split(result, "\n") {
if strings.Contains(line, "-A KUBE-SERVICES") && strings.Contains(line, "-p sctp") { if strings.Contains(line, "-A KUBE-SERVICES") && strings.Contains(line, "-p sctp") {
kubeService = true return true, nil
break
} }
} }
if !kubeService { framework.Logf("retrying ... no iptables rules found for service with sctp ports on node %v", node.Name)
return false, nil
})
if err != nil {
framework.Failf("iptables rules are not set for a clusterip service with sctp ports") framework.Failf("iptables rules are not set for a clusterip service with sctp ports")
} }
ginkgo.By("validating sctp module is still not loaded") ginkgo.By("validating sctp module is still not loaded")