From 71ada9d6f800097449a0bca68a0d5958322d1211 Mon Sep 17 00:00:00 2001 From: Anis Elleuch Date: Mon, 21 Nov 2016 21:45:02 +0100 Subject: [PATCH] commitXLMetadata() expects src and dst buckets in its arguments (#3307) --- cmd/xl-v1-multipart-common.go | 8 ++++---- cmd/xl-v1-multipart.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/xl-v1-multipart-common.go b/cmd/xl-v1-multipart-common.go index 2f731ca41..1180d9469 100644 --- a/cmd/xl-v1-multipart-common.go +++ b/cmd/xl-v1-multipart-common.go @@ -215,7 +215,7 @@ func (xl xlObjects) statPart(bucket, object, uploadID, partName string) (fileInf } // commitXLMetadata - commit `xl.json` from source prefix to destination prefix in the given slice of disks. -func commitXLMetadata(disks []StorageAPI, srcPrefix, dstPrefix string, quorum int) error { +func commitXLMetadata(disks []StorageAPI, srcBucket, srcPrefix, dstBucket, dstPrefix string, quorum int) error { var wg = &sync.WaitGroup{} var mErrs = make([]error, len(disks)) @@ -233,10 +233,10 @@ func commitXLMetadata(disks []StorageAPI, srcPrefix, dstPrefix string, quorum in go func(index int, disk StorageAPI) { defer wg.Done() // Delete any dangling directories. - defer disk.DeleteFile(minioMetaTmpBucket, srcPrefix) + defer disk.DeleteFile(srcBucket, srcPrefix) // Renames `xl.json` from source prefix to destination prefix. - rErr := disk.RenameFile(minioMetaTmpBucket, srcJSONFile, minioMetaBucket, dstJSONFile) + rErr := disk.RenameFile(srcBucket, srcJSONFile, dstBucket, dstJSONFile) if rErr != nil { mErrs[index] = traceError(rErr) return @@ -250,7 +250,7 @@ func commitXLMetadata(disks []StorageAPI, srcPrefix, dstPrefix string, quorum in // Do we have write Quorum?. if !isDiskQuorum(mErrs, quorum) { // Delete all `xl.json` successfully renamed. - deleteAllXLMetadata(disks, minioMetaBucket, dstPrefix, mErrs) + deleteAllXLMetadata(disks, dstBucket, dstPrefix, mErrs) return traceError(errXLWriteQuorum) } diff --git a/cmd/xl-v1-multipart.go b/cmd/xl-v1-multipart.go index b351f9d77..8ed6deee8 100644 --- a/cmd/xl-v1-multipart.go +++ b/cmd/xl-v1-multipart.go @@ -527,7 +527,7 @@ func (xl xlObjects) PutObjectPart(bucket, object, uploadID string, partID int, s if err = writeUniqueXLMetadata(onlineDisks, minioMetaTmpBucket, tempXLMetaPath, partsMetadata, xl.writeQuorum); err != nil { return "", toObjectErr(err, minioMetaTmpBucket, tempXLMetaPath) } - rErr := commitXLMetadata(onlineDisks, tempXLMetaPath, uploadIDPath, xl.writeQuorum) + rErr := commitXLMetadata(onlineDisks, minioMetaTmpBucket, tempXLMetaPath, minioMetaBucket, uploadIDPath, xl.writeQuorum) if rErr != nil { return "", toObjectErr(rErr, minioMetaBucket, uploadIDPath) } @@ -774,7 +774,7 @@ func (xl xlObjects) CompleteMultipartUpload(bucket string, object string, upload if err = writeUniqueXLMetadata(onlineDisks, minioMetaTmpBucket, tempUploadIDPath, partsMetadata, xl.writeQuorum); err != nil { return "", toObjectErr(err, minioMetaTmpBucket, tempUploadIDPath) } - rErr := commitXLMetadata(onlineDisks, tempUploadIDPath, uploadIDPath, xl.writeQuorum) + rErr := commitXLMetadata(onlineDisks, minioMetaTmpBucket, tempUploadIDPath, minioMetaBucket, uploadIDPath, xl.writeQuorum) if rErr != nil { return "", toObjectErr(rErr, minioMetaBucket, uploadIDPath) }