dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-08-09 09:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

erofs: Move immutable file handling before storage.Remove

Browse Source 
The layer blob immutable flag clearing logic was moved before
storage.Remove() call to ensure that immutable files can be properly
removed even if subsequent operations fail after storage.Remove().

The previous order had storage.Remove() called first, which meant if
any subsequent operations failed, there would be no opportunity to
remove the immutable flag on the layer blob files.

Signed-off-by: jinda.ljd <jinda.ljd@alibaba-inc.com>
This commit is contained in:
jinda.ljd
2026-01-21 19:25:01 +08:00
parent 207bf2b57c
commit cf7cb3c35e
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/snapshots/erofs/erofs.go
View File

@@ -728,9 +728,23 @@ func (s *snapshotter) Remove(ctx context.Context, key string) (err error) {
}
}()
return s.ms.WithTransaction(ctx, true, func(ctx context.Context) error {
var k snapshots.Kind
id, info, _, err := storage.GetInfo(ctx, key)
if err != nil {
if errdefs.IsNotFound(err) {
return nil
}
return fmt.Errorf("failed to get snapshot info: %w", err)
}
id, k, err = storage.Remove(ctx, key)
// The layer blob is only persisted for committed snapshots.
if info.Kind == snapshots.KindCommitted {
// Clear IMMUTABLE_FL before removal, since this flag avoids it.
err = setImmutable(s.layerBlobPath(id), false)
if err != nil && !errdefs.IsNotImplemented(err) {
return fmt.Errorf("failed to clear IMMUTABLE_FL: %w", err)
}
}
_, _, err = storage.Remove(ctx, key)
if err != nil {
return fmt.Errorf("failed to remove snapshot %s: %w", key, err)
}
@@ -739,14 +753,6 @@ func (s *snapshotter) Remove(ctx context.Context, key string) (err error) {
if err != nil {
return fmt.Errorf("unable to get directories for removal: %w", err)
}
// The layer blob is only persisted for committed snapshots.
if k == snapshots.KindCommitted {
// Clear IMMUTABLE_FL before removal, since this flag avoids it.
err = setImmutable(s.layerBlobPath(id), false)
if err != nil && !errdefs.IsNotImplemented(err) {
return fmt.Errorf("failed to clear IMMUTABLE_FL: %w", err)
}
}
return nil
})
}