mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Merge pull request #111238 from bobbypage/fix-npd-test
test: Only Check NPD logs in standalone mode
This commit is contained in:
commit
e348a76e10
@ -113,6 +113,7 @@ var _ = SIGDescribe("NodeProblemDetector", func() {
|
||||
result, err := e2essh.SSH(cmd, host, framework.TestContext.Provider)
|
||||
isStandaloneMode[host] = (err == nil && result.Code == 0)
|
||||
|
||||
if isStandaloneMode[host] {
|
||||
ginkgo.By(fmt.Sprintf("Check node %q has node-problem-detector process", host))
|
||||
// Using brackets "[n]" is a trick to prevent grep command itself from
|
||||
// showing up, because string text "[n]ode-problem-detector" does not
|
||||
@ -170,20 +171,15 @@ var _ = SIGDescribe("NodeProblemDetector", func() {
|
||||
}
|
||||
}
|
||||
|
||||
if !checkForKubeletStart {
|
||||
ginkgo.By("KubeletStart event will NOT be checked")
|
||||
}
|
||||
|
||||
if isStandaloneMode[host] {
|
||||
cpuUsage, uptime := getCPUStat(f, host)
|
||||
cpuUsageStats[host] = append(cpuUsageStats[host], cpuUsage)
|
||||
uptimeStats[host] = append(uptimeStats[host], uptime)
|
||||
}
|
||||
|
||||
}
|
||||
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)
|
||||
result, err = e2essh.SSH(injectLogCmd, host, framework.TestContext.Provider)
|
||||
framework.ExpectNoError(err)
|
||||
framework.ExpectEqual(result.Code, 0)
|
||||
}
|
||||
@ -211,6 +207,8 @@ var _ = SIGDescribe("NodeProblemDetector", func() {
|
||||
gomega.Eventually(func() error {
|
||||
return verifyEventExists(f, eventListOptions, "KubeletStart", node.Name)
|
||||
}, pollTimeout, pollInterval).Should(gomega.Succeed())
|
||||
} else {
|
||||
ginkgo.By("KubeletStart event will NOT be checked")
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user