lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-19 13:47:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.add S3 copy directory function

Browse Source 
2.fixed the problem of empty directory when S3 deleted the directory
This commit is contained in:
limd
2020-09-23 11:26:01 +08:00
parent 082500151a
commit a99f63cb4d
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
weed/s3api/s3api_object_handlers.go
View File

@@ -112,6 +112,12 @@ func (s3a *S3ApiServer) DeleteObjectHandler(w http.ResponseWriter, r *http.Reque
bucket, object := getBucketAndObject(r)
response, _ := s3a.listFilerEntries(bucket, object, 1, "", "/")
if len(response.Contents) != 0 && strings.HasSuffix(r.URL.Path, "/") {
w.WriteHeader(http.StatusNoContent)
return
}
destUrl := fmt.Sprintf("http://%s%s/%s%s?recursive=true",
s3a.option.Filer, s3a.option.BucketsPath, bucket, object)
@@ -121,7 +127,6 @@ func (s3a *S3ApiServer) DeleteObjectHandler(w http.ResponseWriter, r *http.Reque
}
w.WriteHeader(http.StatusNoContent)
})
}
// / ObjectIdentifier carries key name for the object to delete.