native: fix deadlock from leaving transactions open

tonistiigi · thaJeztah · commit 603ef55e0e69 · 2022-03-24T02:58:51.000+01:00
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit fe42622) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/snapshots/native/native.go b/snapshots/native/native.go
@@ -151,11 +151,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
 	}
 
@@ -282,6 +288,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, errors.Wrap(err, "copying of parent failed")
 			}
 		}

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