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

Merge pull request #41276 from Random-Liu/print-pods-containers-in-oom-score-test

Browse Source 
Automatic merge from submit-queue

Print running pods and containers in infra container oom score test.

Printing more logs to help debug https://github.com/kubernetes/kubernetes/issues/37580.

@yujuhong @feiskyer
This commit is contained in:
Kubernetes Submit Queue 2017-02-11 08:06:16 -08:00 committed by GitHub
commit 14ab8eb0ad
1 changed files with 51 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e_node/container_manager_test.go
View File

@ -92,6 +92,7 @@ var _ = framework.KubeDescribe("Kubelet Container Manager [Serial]", func() {
return validateOOMScoreAdjSetting(kubeletPids[0], -999)
}, 5*time.Minute, 30*time.Second).Should(BeNil())
})
Context("", func() {
It("pod infra containers oom-score-adj should be -998 and best effort container's should be 1000", func() {
var err error
podClient := f.PodClient()
@ -135,7 +136,17 @@ var _ = framework.KubeDescribe("Kubelet Container Manager [Serial]", func() {
}
return validateOOMScoreAdjSetting(shPids[0], 1000)
}, 2*time.Minute, time.Second*4).Should(BeNil())
})
// Log the running containers here to help debugging. Use `docker ps`
// directly for now because the test is already docker specific.
AfterEach(func() {
if CurrentGinkgoTestDescription().Failed {
By("Dump all running docker containers")
output, err := exec.Command("docker", "ps").CombinedOutput()
Expect(err).NotTo(HaveOccurred())
framework.Logf("Running docker containers:\n%s", string(output))
}
})
})
It("guaranteed container's oom-score-adj should be -998", func() {
podClient := f.PodClient()