gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delete from the deepest directory first when checking empty folders

Browse Source
This commit is contained in:
Chris Lu
2021-01-28 14:28:40 -08:00
parent e9d8201925
commit c2bf1a88ac
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
weed/s3api/s3api_object_handlers.go
View File

@@ -8,6 +8,7 @@ import (
"io" "io"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"sort"
"strings" "strings"
"github.com/chrislusf/seaweedfs/weed/s3api/s3err" "github.com/chrislusf/seaweedfs/weed/s3api/s3err"
@@ -204,11 +205,20 @@ func (s3a *S3ApiServer) DeleteMultipleObjectsHandler(w http.ResponseWriter, r *h
} }
} }
// purge empty folders, only checking folders with deletions // purge empty folders, only checking folders with deletions
for dir, deletionCount := range directoriesWithDeletion { var allDirs []string
for dir, _ := range directoriesWithDeletion {
allDirs = append(allDirs, dir)
}
sort.Slice(allDirs, func(i, j int) bool {
return len(allDirs[i]) > len(allDirs[j])
})
for _, dir := range allDirs {
parentDir, dirName := util.FullPath(dir).DirAndName() parentDir, dirName := util.FullPath(dir).DirAndName()
if err := doDeleteEntry(client, parentDir, dirName, false, false); err != nil { if err := doDeleteEntry(client, parentDir, dirName, false, false); err != nil {
glog.V(4).Infof("directory %s has %d deletion but still not empty: %v", dir, deletionCount, err) glog.V(4).Infof("directory %s has %d deletion but still not empty: %v", dir, directoriesWithDeletion[dir], err)
} }
} }