From c35502ad4bd54faba5c6d6fd4cbe9d05558b8ae4 Mon Sep 17 00:00:00 2001 From: Julie Qi Date: Fri, 30 Jul 2021 16:58:17 -0700 Subject: [PATCH] Remove AUFSUmountHung from NPD test --- test/e2e/node/node_problem_detector.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/node/node_problem_detector.go b/test/e2e/node/node_problem_detector.go index 1f97c1e618c..0c74accd3d5 100644 --- a/test/e2e/node/node_problem_detector.go +++ b/test/e2e/node/node_problem_detector.go @@ -129,8 +129,8 @@ var _ = SIGDescribe("NodeProblemDetector", func() { uptimeStats[host] = append(uptimeStats[host], uptime) } - ginkgo.By(fmt.Sprintf("Inject log to trigger AUFSUmountHung on node %q", host)) - log := "INFO: task umount.aufs:21568 blocked for more than 120 seconds." + ginkgo.By(fmt.Sprintf("Inject log to trigger DockerHung on node %q", host)) + log := "INFO: task docker:12345 blocked for more than 120 seconds." injectLogCmd := "sudo sh -c \"echo 'kernel: " + log + "' >> /dev/kmsg\"" _, err = e2essh.SSH(injectLogCmd, host, framework.TestContext.Provider) framework.ExpectNoError(err) @@ -141,13 +141,13 @@ var _ = SIGDescribe("NodeProblemDetector", func() { for _, node := range nodes { ginkgo.By(fmt.Sprintf("Check node-problem-detector posted KernelDeadlock condition on node %q", node.Name)) 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()) - 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()} 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()) // Node problem detector reports kubelet start events automatically starting from NPD v0.7.0+.