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

s3: copy object to itself

Browse Source 
fix https://github.com/chrislusf/seaweedfs/issues/1922
This commit is contained in:
Chris Lu
2021-03-19 01:31:49 -07:00
parent aa5179ce3c
commit b1a86cf808
5 changed files with 68 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
weed/server/filer_server_handlers_write_autochunk.go
View File

@@ -212,7 +212,7 @@ func (fs *FilerServer) saveMetaData(ctx context.Context, r *http.Request, fileNa
entry.Extended = make(map[string][]byte)
}
fs.saveAmzMetaData(r, entry)
SaveAmzMetaData(r, entry.Extended, false)
for k, v := range r.Header {
if len(v) > 0 && strings.HasPrefix(k, needle.PairNamePrefix) {
@@ -383,17 +383,24 @@ func (fs *FilerServer) mkdir(ctx context.Context, w http.ResponseWriter, r *http
return filerResult, replyerr
}
func (fs *FilerServer) saveAmzMetaData(r *http.Request, entry *filer.Entry) {
func SaveAmzMetaData(r *http.Request, existing map[string][]byte, isReplace bool) (metadata map[string][]byte) {
metadata = make(map[string][]byte)
if !isReplace {
for k, v := range existing {
metadata[k] = v
}
}
if sc := r.Header.Get(xhttp.AmzStorageClass); sc != "" {
entry.Extended[xhttp.AmzStorageClass] = []byte(sc)
metadata[xhttp.AmzStorageClass] = []byte(sc)
}
if tags := r.Header.Get(xhttp.AmzObjectTagging); tags != "" {
for _, v := range strings.Split(tags, "&") {
tag := strings.Split(v, "=")
if len(tag) == 2 {
entry.Extended[xhttp.AmzObjectTagging+"-"+tag[0]] = []byte(tag[1])
metadata[xhttp.AmzObjectTagging+"-"+tag[0]] = []byte(tag[1])
}
}
}
@@ -401,8 +408,11 @@ func (fs *FilerServer) saveAmzMetaData(r *http.Request, entry *filer.Entry) {
for header, values := range r.Header {
if strings.HasPrefix(header, xhttp.AmzUserMetaPrefix) {
for _, value := range values {
entry.Extended[header] = []byte(value)
metadata[header] = []byte(value)
}
}
}
return
}