Make sure exec process is killed when context is canceled.

Signed-off-by: Lantao Liu <lantaol@google.com>
containerd · May 28, 2019 · d257c16 · d257c16
1 parent ac9f8e1
commit d257c16
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/server/container_execsync.go b/pkg/server/container_execsync.go
@@ -134,7 +134,7 @@ func (c *criService) execInContainer(ctx context.Context, id string, opts execOp
 	defer func() {
 		deferCtx, deferCancel := ctrdutil.DeferContext()
 		defer deferCancel()
-		if _, err := process.Delete(deferCtx); err != nil {
+		if _, err := process.Delete(deferCtx, containerd.WithProcessKill); err != nil {
 			logrus.WithError(err).Errorf("Failed to delete exec process %q for container %q", execID, id)
 		}
 	}()