From d257c16dbc144a167780b9b3cee5ee6a71d2b64b Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Tue, 28 May 2019 12:25:03 -0700 Subject: [PATCH] Make sure exec process is killed when context is canceled. Signed-off-by: Lantao Liu --- pkg/server/container_execsync.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/server/container_execsync.go b/pkg/server/container_execsync.go index 36c9db409..6116ee523 100644 --- 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) } }()