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

Merge pull request #104048 from lizhuqi/fix-npd-test

Browse Source 
Remove AUFSUmountHung from NPD test
This commit is contained in:
Kubernetes Prow Robot 2021-08-10 17:40:46 -07:00 committed by GitHub
commit 6b7c0cb386
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/node/node_problem_detector.go
View File

@ -129,8 +129,8 @@ var _ = SIGDescribe("NodeProblemDetector", func() {
uptimeStats[host] = append(uptimeStats[host], uptime) uptimeStats[host] = append(uptimeStats[host], uptime)
} }
ginkgo.By(fmt.Sprintf("Inject log to trigger AUFSUmountHung on node %q", host)) ginkgo.By(fmt.Sprintf("Inject log to trigger DockerHung on node %q", host))
log := "INFO: task umount.aufs:21568 blocked for more than 120 seconds." log := "INFO: task docker:12345 blocked for more than 120 seconds."
injectLogCmd := "sudo sh -c \"echo 'kernel: " + log + "' >> /dev/kmsg\"" injectLogCmd := "sudo sh -c \"echo 'kernel: " + log + "' >> /dev/kmsg\""
_, err = e2essh.SSH(injectLogCmd, host, framework.TestContext.Provider) _, err = e2essh.SSH(injectLogCmd, host, framework.TestContext.Provider)
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -141,13 +141,13 @@ var _ = SIGDescribe("NodeProblemDetector", func() {
for _, node := range nodes { for _, node := range nodes {
ginkgo.By(fmt.Sprintf("Check node-problem-detector posted KernelDeadlock condition on node %q", node.Name)) ginkgo.By(fmt.Sprintf("Check node-problem-detector posted KernelDeadlock condition on node %q", node.Name))
gomega.Eventually(func() error { gomega.Eventually(func() error {
return verifyNodeCondition(f, "KernelDeadlock", v1.ConditionTrue, "AUFSUmountHung", node.Name) return verifyNodeCondition(f, "KernelDeadlock", v1.ConditionTrue, "DockerHung", node.Name)
}, pollTimeout, pollInterval).Should(gomega.Succeed()) }, pollTimeout, pollInterval).Should(gomega.Succeed())
ginkgo.By(fmt.Sprintf("Check node-problem-detector posted AUFSUmountHung event on node %q", node.Name)) ginkgo.By(fmt.Sprintf("Check node-problem-detector posted DockerHung event on node %q", node.Name))
eventListOptions := metav1.ListOptions{FieldSelector: fields.Set{"involvedObject.kind": "Node"}.AsSelector().String()} eventListOptions := metav1.ListOptions{FieldSelector: fields.Set{"involvedObject.kind": "Node"}.AsSelector().String()}
gomega.Eventually(func() error { gomega.Eventually(func() error {
return verifyEvents(f, eventListOptions, 1, "AUFSUmountHung", node.Name) return verifyEvents(f, eventListOptions, 1, "DockerHung", node.Name)
}, pollTimeout, pollInterval).Should(gomega.Succeed()) }, pollTimeout, pollInterval).Should(gomega.Succeed())
// Node problem detector reports kubelet start events automatically starting from NPD v0.7.0+. // Node problem detector reports kubelet start events automatically starting from NPD v0.7.0+.