Merge pull request #5196 from Iceber/fix-rootfs

estesp · web-flow · commit 5461fa3a754d · 2021-03-15T09:54:47.000-04:00
rootfs: fix the error handling of the snapshotter.Commit
diff --git a/rootfs/init.go b/rootfs/init.go
@@ -67,7 +67,7 @@ func InitRootFS(ctx context.Context, name string, parent digest.Digest, readonly
 	return snapshotter.Prepare(ctx, name, parentS)
 }
 
-func createInitLayer(ctx context.Context, parent, initName string, initFn func(string) error, snapshotter snapshots.Snapshotter, mounter Mounter) (string, error) {
+func createInitLayer(ctx context.Context, parent, initName string, initFn func(string) error, snapshotter snapshots.Snapshotter, mounter Mounter) (_ string, retErr error) {
 	initS := fmt.Sprintf("%s %s", parent, initName)
 	if _, err := snapshotter.Stat(ctx, initS); err == nil {
 		return initS, nil
@@ -87,7 +87,7 @@ func createInitLayer(ctx context.Context, parent, initName string, initFn func(s
 	}
 
 	defer func() {
-		if err != nil {
+		if retErr != nil {
 			if rerr := snapshotter.Remove(ctx, td); rerr != nil {
 				log.G(ctx).Errorf("Failed to remove snapshot %s: %v", td, rerr)
 			}

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func InitRootFS(ctx context.Context, name string, parent digest.Digest, readonly`
`67`	`67`	`return snapshotter.Prepare(ctx, name, parentS)`
`68`	`68`	`}`
`69`	`69`
`70`		`-func createInitLayer(ctx context.Context, parent, initName string, initFn func(string) error, snapshotter snapshots.Snapshotter, mounter Mounter) (string, error) {`
	`70`	`+func createInitLayer(ctx context.Context, parent, initName string, initFn func(string) error, snapshotter snapshots.Snapshotter, mounter Mounter) (_ string, retErr error) {`
`71`	`71`	`initS := fmt.Sprintf("%s %s", parent, initName)`
`72`	`72`	`if _, err := snapshotter.Stat(ctx, initS); err == nil {`
`73`	`73`	`return initS, nil`
`@@ -87,7 +87,7 @@ func createInitLayer(ctx context.Context, parent, initName string, initFn func(s`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`defer func() {`
`90`		`- if err != nil {`
	`90`	`+ if retErr != nil {`
`91`	`91`	`if rerr := snapshotter.Remove(ctx, td); rerr != nil {`
`92`	`92`	`log.G(ctx).Errorf("Failed to remove snapshot %s: %v", td, rerr)`
`93`	`93`	`}`