From 16dca4ecd405197bcb4c57cb21f3396af84eeee0 Mon Sep 17 00:00:00 2001
From: Manabu Sugimoto <Manabu.Sugimoto@sony.com>
Date: Tue, 1 Nov 2022 17:01:19 +0900
Subject: [PATCH] runk: Ignore an error when calling kill cmd with --all option

Ignore an error handling that is triggered when the kill command is called
with `--all option` to the stopped container.

High-level container runtimes such as containerd call the kill command with
`--all` option in order to terminate all processes inside the container
even if the container already is stopped. Hence, a low-level runtime
should allow `kill --all` regardless of the container state like runc.

This commit reverts to the previous behavior.

Fixes: #5555

Signed-off-by: Manabu Sugimoto <Manabu.Sugimoto@sony.com>
---
 src/tools/runk/libcontainer/src/container.rs | 18 ++++++++++--------
 src/tools/runk/libcontainer/src/status.rs    |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/tools/runk/libcontainer/src/container.rs b/src/tools/runk/libcontainer/src/container.rs
index fce2d9ecd4..260ea9d367 100644
--- a/src/tools/runk/libcontainer/src/container.rs
+++ b/src/tools/runk/libcontainer/src/container.rs
@@ -83,14 +83,6 @@ impl Container {
     }
 
     pub fn kill(&self, signal: Signal, all: bool) -> Result<()> {
-        if self.state == ContainerState::Stopped {
-            return Err(anyhow!(
-                "container {} can't be killed because it is {:?}",
-                self.status.id,
-                self.state
-            ));
-        }
-
         if all {
             let pids = self.processes()?;
             for pid in pids {
@@ -100,6 +92,16 @@ impl Container {
                 kill(pid, signal)?;
             }
         } else {
+            // If --all option is not specified and the container is stopped,
+            // kill operation generates an error in accordance with the OCI runtime spec.
+            if self.state == ContainerState::Stopped {
+                return Err(anyhow!(
+                    "container {} can't be killed because it is {:?}",
+                    self.status.id,
+                    self.state
+                ));
+            }
+
             let pid = Pid::from_raw(self.status.pid);
             if status::is_process_running(pid)? {
                 kill(pid, signal)?;
diff --git a/src/tools/runk/libcontainer/src/status.rs b/src/tools/runk/libcontainer/src/status.rs
index 6a3480c591..a5187e1f4f 100644
--- a/src/tools/runk/libcontainer/src/status.rs
+++ b/src/tools/runk/libcontainer/src/status.rs
@@ -141,7 +141,7 @@ pub fn is_process_running(pid: Pid) -> Result<bool> {
     match kill(pid, None) {
         Err(errno) => {
             if errno != Errno::ESRCH {
-                return Err(anyhow!("no such process"));
+                return Err(anyhow!("failed to kill process {}: {:?}", pid, errno));
             }
             Ok(false)
         }