From 2787e8c18ce3b6f1009d60061e4254370e37fb0a Mon Sep 17 00:00:00 2001 From: Odin Ugedal Date: Mon, 24 May 2021 16:22:26 +0200 Subject: [PATCH] Kill container runtime with SIGKILL Make sure to use SIGKILL so that the service is killed in a dirty way. In case container runtime use "Restart=on-abnormal" in systemd, killing with SIGTERM will not restart the service, as the kill looks intentional and clean. This is used by cri-o by default. --- test/e2e_node/restart_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e_node/restart_test.go b/test/e2e_node/restart_test.go index e7e827075ee..8f2f00429c3 100644 --- a/test/e2e_node/restart_test.go +++ b/test/e2e_node/restart_test.go @@ -112,7 +112,7 @@ var _ = SIGDescribe("Restart [Serial] [Slow] [Disruptive] [NodeFeature:Container } return nil }, 1*time.Minute, 2*time.Second).Should(gomega.BeNil()) - if stdout, err := exec.Command("sudo", "kill", fmt.Sprintf("%d", pid)).CombinedOutput(); err != nil { + if stdout, err := exec.Command("sudo", "kill", "-SIGKILL", fmt.Sprintf("%d", pid)).CombinedOutput(); err != nil { framework.Failf("Failed to kill container runtime (pid=%d): %v, stdout: %q", pid, err, string(stdout)) } // Assume that container runtime will be restarted by systemd/supervisord etc.