Merge pull request #1301 from Random-Liu/cherrypick-#1156-release-1.1

Random-Liu · web-flow · commit 6cdb2faa1f30 · 2019-09-26T13:06:36.000-07:00
[release/1.0] Make sure exec process is killed when context is canceled.
diff --git a/pkg/server/container_execsync.go b/pkg/server/container_execsync.go
@@ -131,7 +131,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)
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func (c *criService) execInContainer(ctx context.Context, id string, opts execOp`
`131`	`131`	`defer func() {`
`132`	`132`	`deferCtx, deferCancel := ctrdutil.DeferContext()`
`133`	`133`	`defer deferCancel()`
`134`		`- if _, err := process.Delete(deferCtx); err != nil {`
	`134`	`+ if _, err := process.Delete(deferCtx, containerd.WithProcessKill); err != nil {`
`135`	`135`	`logrus.WithError(err).Errorf("Failed to delete exec process %q for container %q", execID, id)`
`136`	`136`	`}`
`137`	`137`	`}()`