Merge pull request #6722 from tonistiigi/snapshot-deadlocks

estesp · web-flow · commit db84fdae10b6 · 2022-03-23T21:48:28.000-04:00
native: fix deadlock from leaving transactions open
diff --git a/snapshots/native/native.go b/snapshots/native/native.go
@@ -150,11 +150,17 @@ func (o *snapshotter) Commit(ctx context.Context, name, key string, opts ...snap
 
 	id, _, _, err := storage.GetInfo(ctx, key)
 	if err != nil {
+		if rerr := t.Rollback(); rerr != nil {
+			log.G(ctx).WithError(rerr).Warn("failed to rollback transaction")
+		}
 		return err
 	}
 
 	usage, err := fs.DiskUsage(ctx, o.getSnapshotDir(id))
 	if err != nil {
+		if rerr := t.Rollback(); rerr != nil {
+			log.G(ctx).WithError(rerr).Warn("failed to rollback transaction")
+		}
 		return err
 	}
 
@@ -281,6 +287,9 @@ func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k
 				fs.WithXAttrErrorHandler(xattrErrorHandler),
 			}
 			if err := fs.CopyDir(td, parent, copyDirOpts...); err != nil {
+				if rerr := t.Rollback(); rerr != nil {
+					log.G(ctx).WithError(rerr).Warn("failed to rollback transaction")
+				}
 				return nil, fmt.Errorf("copying of parent failed: %w", err)
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -150,11 +150,17 @@ func (o *snapshotter) Commit(ctx context.Context, name, key string, opts ...snap`
`150`	`150`
`151`	`151`	`id, _, _, err := storage.GetInfo(ctx, key)`
`152`	`152`	`if err != nil {`
	`153`	`+ if rerr := t.Rollback(); rerr != nil {`
	`154`	`+ log.G(ctx).WithError(rerr).Warn("failed to rollback transaction")`
	`155`	`+ }`
`153`	`156`	`return err`
`154`	`157`	`}`
`155`	`158`
`156`	`159`	`usage, err := fs.DiskUsage(ctx, o.getSnapshotDir(id))`
`157`	`160`	`if err != nil {`
	`161`	`+ if rerr := t.Rollback(); rerr != nil {`
	`162`	`+ log.G(ctx).WithError(rerr).Warn("failed to rollback transaction")`
	`163`	`+ }`
`158`	`164`	`return err`
`159`	`165`	`}`
`160`	`166`
`@@ -281,6 +287,9 @@ func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k`
`281`	`287`	`fs.WithXAttrErrorHandler(xattrErrorHandler),`
`282`	`288`	`}`
`283`	`289`	`if err := fs.CopyDir(td, parent, copyDirOpts...); err != nil {`
	`290`	`+ if rerr := t.Rollback(); rerr != nil {`
	`291`	`+ log.G(ctx).WithError(rerr).Warn("failed to rollback transaction")`
	`292`	`+ }`
`284`	`293`	`return nil, fmt.Errorf("copying of parent failed: %w", err)`
`285`	`294`	`}`
`286`	`295`	`}`