shimv2: Merge pull request #1494 from lifupan/fixstop

shimv2: fix the issue of stop container failed (cherry picked from commit c08976e) Fixes:#1493 Signed-off-by: Ganesh Maharaj Mahalingam <[email protected]>
kata-containers · Apr 16, 2019 · 732cfc2 · 732cfc2
1 parent 0b7c329
commit 732cfc2
Showing 1 changed file with 1 addition and 13 deletions.
diff --git a/containerd-shim-v2/service.go b/containerd-shim-v2/service.go
@@ -647,19 +647,7 @@ func (s *service) Kill(ctx context.Context, r *taskAPI.KillRequest) (*ptypes.Emp
 		processID = execs.id
 	}
 
-	err = s.sandbox.SignalProcess(c.id, processID, signum, r.All)
-	if err != nil {
-		return nil, err
-	}
-
-	// Since the k8s will use the SIGTERM signal to stop a container by default, but
-	// some container processes would ignore this signal such as shell, thus it's better
-	// to resend another SIGKILL signal to make sure the container process terminated successfully.
-	if signum == syscall.SIGTERM {
-		err = s.sandbox.SignalProcess(c.id, processID, syscall.SIGKILL, r.All)
-	}
-
-	return empty, err
+	return empty, s.sandbox.SignalProcess(c.id, processID, signum, r.All)
 }
 
 // Pids returns all pids inside the container