lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-10-21 06:27:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

s3 delete-objects pass OK for fail to delete non-empty folder

Browse Source
This commit is contained in:
Konstantin Lebedev
2021-03-10 19:41:35 +05:00
parent 737bde5ab7
commit 15b018da34
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
weed/s3api/s3api_object_handlers.go
View File

@@ -15,6 +15,7 @@ import (
"github.com/gorilla/mux"
"github.com/chrislusf/seaweedfs/weed/filer"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
weed_server "github.com/chrislusf/seaweedfs/weed/server"
@@ -193,7 +194,7 @@ func (s3a *S3ApiServer) DeleteMultipleObjectsHandler(w http.ResponseWriter, r *h
parentDirectoryPath = fmt.Sprintf("%s/%s%s", s3a.option.BucketsPath, bucket, parentDirectoryPath)
err := doDeleteEntry(client, parentDirectoryPath, entryName, isDeleteData, isRecursive)
if err == nil {
if err == nil || strings.Contains(err.Error(), filer.MsgFailDelNonEmptyFolder) {
directoriesWithDeletion[parentDirectoryPath]++
deletedObjects = append(deletedObjects, object)
} else {