mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2026-09-25 01:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

clearer handling on recursive empty directory deletion

Browse Source
This commit is contained in:
chrislu
2025-11-05 13:10:40 -08:00
parent 672488c828
commit 671de48369
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
weed/filer/filer.go
+22 -8
View File
@@ -454,14 +454,28 @@ func (f *Filer) maybeDeleteEmptyParentDirectories(ctx context.Context, parentDir
return false // Stop after first entry
})
if err == nil && isEmpty {
glog.V(2).InfofCtx(ctx, "maybeDeleteEmptyParentDirectories: deleting empty directory %s", parentDir)
grandParentDir, _ := parentDir.DirAndName()
if parentEntry, findErr := f.FindEntry(ctx, parentDir); findErr == nil {
if delErr := f.doDeleteEntryMetaAndData(ctx, parentEntry, false, false, nil); delErr == nil {
// Continue checking upwards
f.maybeDeleteEmptyParentDirectories(ctx, util.FullPath(grandParentDir))
}
if err != nil {
// Error checking directory, stop cleanup
glog.V(3).InfofCtx(ctx, "maybeDeleteEmptyParentDirectories: error checking %s: %v", parentDir, err)
return
}
if !isEmpty {
// Directory is not empty, stop checking upward
glog.V(3).InfofCtx(ctx, "maybeDeleteEmptyParentDirectories: directory %s is not empty, stopping cleanup", parentDir)
return
}
// Directory is empty, try to delete it
glog.V(2).InfofCtx(ctx, "maybeDeleteEmptyParentDirectories: deleting empty directory %s", parentDir)
grandParentDir, _ := parentDir.DirAndName()
if parentEntry, findErr := f.FindEntry(ctx, parentDir); findErr == nil {
if delErr := f.doDeleteEntryMetaAndData(ctx, parentEntry, false, false, nil); delErr == nil {
// Successfully deleted, continue checking upwards
f.maybeDeleteEmptyParentDirectories(ctx, util.FullPath(grandParentDir))
} else {
// Failed to delete, stop cleanup
glog.V(3).InfofCtx(ctx, "maybeDeleteEmptyParentDirectories: failed to delete %s: %v", parentDir, delErr)
}
}
}