Avoid using canceled context in unpacker cleanup

dmcgowan · dmcgowan · commit 0bc9f7b5450b · 2022-12-22T14:53:23.000-08:00
Signed-off-by: Derek McGowan &lt;derek@mcg.dev&gt;
diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go
@@ -342,7 +342,7 @@ func (u *Unpacker) unpack(
 		}
 
 		// Abort the snapshot if commit does not happen
-		abort := func() {
+		abort := func(ctx context.Context) {
 			if err := sn.Remove(ctx, key); err != nil {
 				log.G(ctx).WithError(err).Errorf("failed to cleanup %q", key)
 			}
@@ -367,28 +367,28 @@ func (u *Unpacker) unpack(
 
 		select {
 		case <-ctx.Done():
-			abort()
+			abort(context.Background()) // Cleanup context
 			return ctx.Err()
 		case err := <-fetchErr:
 			if err != nil {
-				abort()
+				abort(ctx)
 				return err
 			}
 		case <-fetchC[i-fetchOffset]:
 		}
 
 		diff, err := a.Apply(ctx, desc, mounts, unpack.ApplyOpts...)
 		if err != nil {
-			abort()
+			abort(ctx)
 			return fmt.Errorf("failed to extract layer %s: %w", diffIDs[i], err)
 		}
 		if diff.Digest != diffIDs[i] {
-			abort()
+			abort(ctx)
 			return fmt.Errorf("wrong diff id calculated on extraction %q", diffIDs[i])
 		}
 
 		if err = sn.Commit(ctx, chainID, key, opts...); err != nil {
-			abort()
+			abort(ctx)
 			if errdefs.IsAlreadyExists(err) {
 				return nil
 			}

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ func (u *Unpacker) unpack(`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`// Abort the snapshot if commit does not happen`
`345`		`- abort := func() {`
	`345`	`+ abort := func(ctx context.Context) {`
`346`	`346`	`if err := sn.Remove(ctx, key); err != nil {`
`347`	`347`	`log.G(ctx).WithError(err).Errorf("failed to cleanup %q", key)`
`348`	`348`	`}`
`@@ -367,28 +367,28 @@ func (u *Unpacker) unpack(`
`367`	`367`
`368`	`368`	`select {`
`369`	`369`	`case <-ctx.Done():`
`370`		`- abort()`
	`370`	`+ abort(context.Background()) // Cleanup context`
`371`	`371`	`return ctx.Err()`
`372`	`372`	`case err := <-fetchErr:`
`373`	`373`	`if err != nil {`
`374`		`- abort()`
	`374`	`+ abort(ctx)`
`375`	`375`	`return err`
`376`	`376`	`}`
`377`	`377`	`case <-fetchC[i-fetchOffset]:`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`diff, err := a.Apply(ctx, desc, mounts, unpack.ApplyOpts...)`
`381`	`381`	`if err != nil {`
`382`		`- abort()`
	`382`	`+ abort(ctx)`
`383`	`383`	`return fmt.Errorf("failed to extract layer %s: %w", diffIDs[i], err)`
`384`	`384`	`}`
`385`	`385`	`if diff.Digest != diffIDs[i] {`
`386`		`- abort()`
	`386`	`+ abort(ctx)`
`387`	`387`	`return fmt.Errorf("wrong diff id calculated on extraction %q", diffIDs[i])`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`if err = sn.Commit(ctx, chainID, key, opts...); err != nil {`
`391`		`- abort()`
	`391`	`+ abort(ctx)`
`392`	`392`	`if errdefs.IsAlreadyExists(err) {`
`393`	`393`	`return nil`
`394`	`394`	`}`