Update checkpoint opts with runtime handling

crosbymichael · crosbymichael · commit aaae81189a40 · 2019-03-06T12:42:45.000-05:00
Signed-off-by: Michael Crosby &lt;crosbymichael@gmail.com&gt;
diff --git a/container_checkpoint_test.go b/container_checkpoint_test.go
@@ -461,7 +461,7 @@ func TestCRWithImagePath(t *testing.T) {
 	defer os.RemoveAll(crDir)
 	imagePath := filepath.Join(crDir, "cr")
 	// checkpoint task
-	if _, err := task.Checkpoint(ctx, WithCheckpointImagePath(client.runtime, imagePath)); err != nil {
+	if _, err := task.Checkpoint(ctx, WithCheckpointImagePath(imagePath)); err != nil {
 		t.Fatal(err)
 	}
 
diff --git a/task.go b/task.go
@@ -117,6 +117,13 @@ type CheckpointTaskInfo struct {
 	ParentCheckpoint digest.Digest
 	// Options hold runtime specific settings for checkpointing a task
 	Options interface{}
+
+	runtime string
+}
+
+// Runtime name for the container
+func (i *CheckpointTaskInfo) Runtime() string {
+	return i.runtime
 }
 
 // CheckpointTaskOpts allows the caller to set checkpoint options
@@ -407,11 +414,17 @@ func (t *task) Checkpoint(ctx context.Context, opts ...CheckpointTaskOpts) (Imag
 		return nil, err
 	}
 	defer done(ctx)
+	cr, err := t.client.ContainerService().Get(ctx, t.id)
+	if err != nil {
+		return nil, err
+	}
 
 	request := &tasks.CheckpointTaskRequest{
 		ContainerID: t.id,
 	}
-	var i CheckpointTaskInfo
+	i := CheckpointTaskInfo{
+		runtime: cr.Runtime.Name,
+	}
 	for _, o := range opts {
 		if err := o(&i); err != nil {
 			return nil, err
@@ -434,10 +447,6 @@ func (t *task) Checkpoint(ctx context.Context, opts ...CheckpointTaskOpts) (Imag
 		return nil, err
 	}
 	defer t.Resume(ctx)
-	cr, err := t.client.ContainerService().Get(ctx, t.id)
-	if err != nil {
-		return nil, err
-	}
 	index := v1.Index{
 		Versioned: is.Versioned{
 			SchemaVersion: 2,
diff --git a/task_opts.go b/task_opts.go
@@ -92,9 +92,9 @@ func WithCheckpointName(name string) CheckpointTaskOpts {
 }
 
 // WithCheckpointImagePath sets image path for checkpoint option
-func WithCheckpointImagePath(rt, path string) CheckpointTaskOpts {
+func WithCheckpointImagePath(path string) CheckpointTaskOpts {
 	return func(r *CheckpointTaskInfo) error {
-		if CheckRuntime(rt, "io.containerd.runc") {
+		if CheckRuntime(r.Runtime(), "io.containerd.runc") {
 			if r.Options == nil {
 				r.Options = &options.CheckpointOptions{}
 			}

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ func TestCRWithImagePath(t *testing.T) {`
`461`	`461`	`defer os.RemoveAll(crDir)`
`462`	`462`	`imagePath := filepath.Join(crDir, "cr")`
`463`	`463`	`// checkpoint task`
`464`		`- if _, err := task.Checkpoint(ctx, WithCheckpointImagePath(client.runtime, imagePath)); err != nil {`
	`464`	`+ if _, err := task.Checkpoint(ctx, WithCheckpointImagePath(imagePath)); err != nil {`
`465`	`465`	`t.Fatal(err)`
`466`	`466`	`}`
`467`	`467`
Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,9 @@ func WithCheckpointName(name string) CheckpointTaskOpts {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`// WithCheckpointImagePath sets image path for checkpoint option`
`95`		`-func WithCheckpointImagePath(rt, path string) CheckpointTaskOpts {`
	`95`	`+func WithCheckpointImagePath(path string) CheckpointTaskOpts {`
`96`	`96`	`return func(r *CheckpointTaskInfo) error {`
`97`		`- if CheckRuntime(rt, "io.containerd.runc") {`
	`97`	`+ if CheckRuntime(r.Runtime(), "io.containerd.runc") {`
`98`	`98`	`if r.Options == nil {`
`99`	`99`	`r.Options = &options.CheckpointOptions{}`
`100`	`100`	`}`