Merge pull request containerd#1954 from crosbymichael/cherry-diff

crosbymichael · web-flow · commit c59bc7e4ab7e · 2018-01-03T13:25:04.000-05:00
[cherry-pick] rootfs: remove upper snapshot after use
diff --git a/rootfs/diff.go b/rootfs/diff.go
@@ -39,7 +39,7 @@ func Diff(ctx context.Context, snapshotID string, sn snapshots.Snapshotter, d di
 		if err != nil {
 			return ocispec.Descriptor{}, err
 		}
-		defer sn.Remove(ctx, lowerKey)
+		defer sn.Remove(ctx, upperKey)
 	}
 
 	return d.DiffMounts(ctx, lower, upper, opts...)

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func Diff(ctx context.Context, snapshotID string, sn snapshots.Snapshotter, d di`
`39`	`39`	`if err != nil {`
`40`	`40`	`return ocispec.Descriptor{}, err`
`41`	`41`	`}`
`42`		`- defer sn.Remove(ctx, lowerKey)`
	`42`	`+ defer sn.Remove(ctx, upperKey)`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`return d.DiffMounts(ctx, lower, upper, opts...)`