cr: fix checkpoint from image getting skipped

schrej · schrej · commit ab5d93187c22 · 2020-09-08T16:44:03.000Z
Fix restoring from a checkpoint image always getting skipped when no checkpoint image path is set. As one restores either from an image OR a path, this makes no sense.

Signed-off-by: Jakob Schrettenbrunner &lt;dev@schrej.net&gt;
diff --git a/services/tasks/local.go b/services/tasks/local.go
@@ -148,7 +148,7 @@ func (l *local) Create(ctx context.Context, r *api.CreateTaskRequest, _ ...grpc.
 		return nil, err
 	}
 	// jump get checkpointPath from checkpoint image
-	if checkpointPath != "" && r.Checkpoint != nil {
+	if checkpointPath == "" && r.Checkpoint != nil {
 		checkpointPath, err = ioutil.TempDir(os.Getenv("XDG_RUNTIME_DIR"), "ctrd-checkpoint")
 		if err != nil {
 			return nil, err

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ func (l local) Create(ctx context.Context, r api.CreateTaskRequest, _ ...grpc.`
`148`	`148`	`return nil, err`
`149`	`149`	`}`
`150`	`150`	`// jump get checkpointPath from checkpoint image`
`151`		`- if checkpointPath != "" && r.Checkpoint != nil {`
	`151`	`+ if checkpointPath == "" && r.Checkpoint != nil {`
`152`	`152`	`checkpointPath, err = ioutil.TempDir(os.Getenv("XDG_RUNTIME_DIR"), "ctrd-checkpoint")`
`153`	`153`	`if err != nil {`
`154`	`154`	`return nil, err`