Merge pull request #37360 from bjbroder/checkpoint-exit

Fix checkpoint's exiting semantics. Upstream-commit: c3a02077149ea8ee1d53b2b60a3d36c29d1505f8 Component: engine
2018-07-26 14:25:49 +02:00
parent 0d95964029 6817733c2a
commit 38f6818cef
1 changed files with 5 additions and 1 deletions
--- a/components/engine/libcontainerd/client_daemon.go
+++ b/components/engine/libcontainerd/client_daemon.go
@ -561,7 +561,11 @@ func (c *client) CreateCheckpoint(ctx context.Context, containerID, checkpointDi
 		return err
 	}

-	img, err := p.(containerd.Task).Checkpoint(ctx)
+	opts := []containerd.CheckpointTaskOpts{}
+	if exit {
+		opts = append(opts, containerd.WithExit)
+	}
+	img, err := p.(containerd.Task).Checkpoint(ctx, opts...)
 	if err != nil {
 		return wrapError(err)
 	}