MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-03-30 17:23:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Save ETag when updating metadata (#5626)

Browse Source 
Fixes #5622
This commit is contained in:
Harshavardhana 2018-03-09 10:50:39 -08:00 committed by kannappanr
parent ba0c7544ea
commit 7aaf01eb74
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/fs-v1.go
View File

@ -403,6 +403,7 @@ func (fs *FSObjects) CopyObject(srcBucket, srcObject, dstBucket, dstObject strin
} }
fsMeta.Meta = srcInfo.UserDefined fsMeta.Meta = srcInfo.UserDefined
fsMeta.Meta["etag"] = srcInfo.ETag
if _, err = fsMeta.WriteTo(wlk); err != nil { if _, err = fsMeta.WriteTo(wlk); err != nil {
return oi, toObjectErr(err, srcBucket, srcObject) return oi, toObjectErr(err, srcBucket, srcObject)
} }

3
cmd/object-handlers.go
View File

@ -483,9 +483,6 @@ func (api objectAPIHandlers) CopyObjectHandler(w http.ResponseWriter, r *http.Re
srcInfo.UserDefined[k] = v srcInfo.UserDefined[k] = v
} }
// Make sure to remove saved etag if any, CopyObject calculates a new one.
delete(srcInfo.UserDefined, "etag")
// Check if x-amz-metadata-directive was not set to REPLACE and source, // Check if x-amz-metadata-directive was not set to REPLACE and source,
// desination are same objects. Apply this restriction also when // desination are same objects. Apply this restriction also when
// metadataOnly is true indicating that we are not overwriting the object. // metadataOnly is true indicating that we are not overwriting the object.

1
cmd/xl-v1-object.go
View File

@ -114,6 +114,7 @@ func (xl xlObjects) CopyObject(srcBucket, srcObject, dstBucket, dstObject string
// Update `xl.json` content on each disks. // Update `xl.json` content on each disks.
for index := range metaArr { for index := range metaArr {
metaArr[index].Meta = srcInfo.UserDefined metaArr[index].Meta = srcInfo.UserDefined
metaArr[index].Meta["etag"] = srcInfo.ETag
} }
var onlineDisks []StorageAPI var onlineDisks []StorageAPI