Merge pull request #2900 from Ace-Tang/fix_snapshot_remove

crosbymichael · web-flow · commit 96f306ee4cb2 · 2019-01-15T11:42:27.000-05:00
fix: miss remove temp file in createSnapshot
diff --git a/snapshots/native/native.go b/snapshots/native/native.go
@@ -241,9 +241,8 @@ func (o *snapshotter) Walk(ctx context.Context, fn func(context.Context, snapsho
 	return storage.WalkInfo(ctx, fn)
 }
 
-func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, key, parent string, opts []snapshots.Opt) ([]mount.Mount, error) {
+func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, key, parent string, opts []snapshots.Opt) (_ []mount.Mount, err error) {
 	var (
-		err      error
 		path, td string
 	)
 
diff --git a/snapshots/overlay/overlay.go b/snapshots/overlay/overlay.go
@@ -350,7 +350,7 @@ func (o *snapshotter) getCleanupDirectories(ctx context.Context, t storage.Trans
 	return cleanup, nil
 }
 
-func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, key, parent string, opts []snapshots.Opt) ([]mount.Mount, error) {
+func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, key, parent string, opts []snapshots.Opt) (_ []mount.Mount, err error) {
 	ctx, t, err := o.ms.TransactionContext(ctx, true)
 	if err != nil {
 		return nil, err

Original file line number	Diff line number	Diff line change
`@@ -241,9 +241,8 @@ func (o *snapshotter) Walk(ctx context.Context, fn func(context.Context, snapsho`
`241`	`241`	`return storage.WalkInfo(ctx, fn)`
`242`	`242`	`}`
`243`	`243`
`244`		`-func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, key, parent string, opts []snapshots.Opt) ([]mount.Mount, error) {`
	`244`	`+func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, key, parent string, opts []snapshots.Opt) (_ []mount.Mount, err error) {`
`245`	`245`	`var (`
`246`		`- err error`
`247`	`246`	`path, td string`
`248`	`247`	`)`
`249`	`248`
Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ func (o *snapshotter) getCleanupDirectories(ctx context.Context, t storage.Trans`
`350`	`350`	`return cleanup, nil`
`351`	`351`	`}`
`352`	`352`
`353`		`-func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, key, parent string, opts []snapshots.Opt) ([]mount.Mount, error) {`
	`353`	`+func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, key, parent string, opts []snapshots.Opt) (_ []mount.Mount, err error) {`
`354`	`354`	`ctx, t, err := o.ms.TransactionContext(ctx, true)`
`355`	`355`	`if err != nil {`
`356`	`356`	`return nil, err`