agent: fix kata agent SignalProcess ExecId

Kata Agent uses empty ExecId to signal all processes of a container. Signed-off-by: Peng Tao <[email protected]>
hyperhq · Feb 11, 2018 · dbb9e2f · dbb9e2f
1 parent 691cf49
commit dbb9e2f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/agent/hyperstart.go b/agent/hyperstart.go
@@ -982,6 +982,11 @@ func (h *jsonBasedHyperstart) ExecProcess(container, process string, user *runva
 }
 
 func (h *jsonBasedHyperstart) SignalProcess(container, process string, signal syscall.Signal) error {
+	// Kata agent API requires process == "" to kill all processes in a container
+	// Convert it back to hyperstart semantics.
+	if process == "" {
+		process = "init"
+	}
 	if h.vmAPIVersion <= 4242 {
 		if process == "init" {
 			return h.hyperstartCommand(hyperstartapi.INIT_KILLCONTAINER, hyperstartapi.KillCommand{

diff --git a/agent/kata.go b/agent/kata.go
@@ -253,6 +253,10 @@ func (kata *kataAgent) ExecProcess(container, process string, user *runvapi.User
 }
 
 func (kata *kataAgent) SignalProcess(container, process string, signal syscall.Signal) error {
+	// Kata Agent uses empty ExecId to signal all processes of a container
+	if process == "init" {
+		process = ""
+	}
 	_, err := kata.agent.SignalProcess(context.Background(), &kagenta.SignalProcessRequest{
 		ContainerId: container,
 		ExecId:      process,