cmd/ctr: protect contents from GC

Kazuyoshi Kato · Kazuyoshi Kato · commit 85309b083714 · 2021-07-06T15:07:58.000-07:00
"ctr image import" didn't have a lease. Due to that, GC would remove contents during the import process. Fixes #5690. Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
diff --git a/cmd/ctr/commands/images/import.go b/cmd/ctr/commands/images/import.go
@@ -122,6 +122,13 @@ If foobar.tar contains an OCI ref named "latest" and anonymous ref "sha256:deadb
 				return err
 			}
 		}
+
+		ctx, done, err := client.WithLease(ctx)
+		if err != nil {
+			return err
+		}
+		defer done(ctx)
+
 		imgs, err := client.Import(ctx, r, opts...)
 		closeErr := r.Close()
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,13 @@ If foobar.tar contains an OCI ref named "latest" and anonymous ref "sha256:deadb`
`122`	`122`	`return err`
`123`	`123`	`}`
`124`	`124`	`}`
	`125`	`+`
	`126`	`+ ctx, done, err := client.WithLease(ctx)`
	`127`	`+ if err != nil {`
	`128`	`+ return err`
	`129`	`+ }`
	`130`	`+ defer done(ctx)`
	`131`	`+`
`125`	`132`	`imgs, err := client.Import(ctx, r, opts...)`
`126`	`133`	`closeErr := r.Close()`
`127`	`134`	`if err != nil {`