gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues 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
Show stats Download patch file Download diff file Expand all files Collapse all files

22
weed/s3api/s3api_object_copy_handlers.go
View file

@ -1,6 +1,7 @@
package s3api
import (
"crypto/md5"
"fmt"
"github.com/chrislusf/seaweedfs/weed/s3api/s3err"
"net/http"
@ -82,7 +83,7 @@ type CopyPartResult struct {
func (s3a *S3ApiServer) CopyObjectPartHandler(w http.ResponseWriter, r *http.Request) {
// https://docs.aws.amazon.com/AmazonS3/latest/dev/CopyingObjctsUsingRESTMPUapi.html
// https://docs.aws.amazon.com/AmazonS3/latest/API/API_UploadPartCopy.html
dstBucket, _ := getBucketAndObject(r)
dstBucket, dstObject := getBucketAndObject(r)
// Copy source path.
cpSrcPath, err := url.QueryUnescape(r.Header.Get("X-Amz-Copy-Source"))
@ -127,11 +128,20 @@ func (s3a *S3ApiServer) CopyObjectPartHandler(w http.ResponseWriter, r *http.Req
}
defer dataReader.Close()
etag, errCode := s3a.putToFiler(r, dstUrl, dataReader)
if errCode != s3err.ErrNone {
writeErrorResponse(w, errCode, r.URL)
return
var etag string
if strings.HasSuffix(srcObject, "/") {
if err := s3a.mkdir(s3a.option.BucketsPath, dstBucket+dstObject, nil); err != nil {
writeErrorResponse(w, s3err.ErrInternalError, r.URL)
return
}
etag = fmt.Sprintf("%x", md5.New().Sum(nil))
} else {
_etag, errCode := s3a.putToFiler(r, dstUrl, dataReader)
etag = _etag
if errCode != s3err.ErrNone {
writeErrorResponse(w, errCode, r.URL)
return
}
}
setEtag(w, etag)

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.