Merge pull request #8002 from thaJeztah/1.6_backport_fix_tx_closed

[release/1.6 backport] Fix tx closed error when upperdirlabel specified
containerd · Jan 25, 2023 · 394f5ee · 394f5ee
2 parents 8511d43 + 8c70403
commit 394f5ee
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/snapshots/overlay/overlay.go b/snapshots/overlay/overlay.go
@@ -160,10 +160,6 @@ func (o *snapshotter) Update(ctx context.Context, info snapshots.Info, fieldpath
 		return snapshots.Info{}, err
 	}
 
-	if err := t.Commit(); err != nil {
-		return snapshots.Info{}, err
-	}
-
 	if o.upperdirLabel {
 		id, _, _, err := storage.GetInfo(ctx, info.Name)
 		if err != nil {
@@ -175,6 +171,10 @@ func (o *snapshotter) Update(ctx context.Context, info snapshots.Info, fieldpath
 		info.Labels[upperdirKey] = o.upperPath(id)
 	}
 
+	if err := t.Commit(); err != nil {
+		return snapshots.Info{}, err
+	}
+
 	return info, nil
 }