From 0fddf3fe17c166c16d9bb78ad135789809601c5f Mon Sep 17 00:00:00 2001 From: Anis Elleuch Date: Tue, 12 Jul 2016 17:38:45 +0100 Subject: [PATCH] Avoid creating tmp directories under .minio/tmp/ to facilitate cleaning (#2187) --- fs-v1-metadata.go | 4 ++-- fs-v1-multipart.go | 28 ++++++++++++++-------------- xl-v1-multipart.go | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/fs-v1-metadata.go b/fs-v1-metadata.go index d4070235f..501a18452 100644 --- a/fs-v1-metadata.go +++ b/fs-v1-metadata.go @@ -112,12 +112,12 @@ func writeFSFormatData(storage StorageAPI, fsFormat formatConfigV1) error { } // writeFSMetadata - writes `fs.json` metadata. -func (fs fsObjects) writeFSMetadata(bucket, prefix string, fsMeta fsMetaV1) error { +func (fs fsObjects) writeTempFSMetadata(bucket, path string, fsMeta fsMetaV1) error { metadataBytes, err := json.Marshal(fsMeta) if err != nil { return err } - if err = fs.storage.AppendFile(bucket, path.Join(prefix, fsMetaJSONFile), metadataBytes); err != nil { + if err = fs.storage.AppendFile(bucket, path, metadataBytes); err != nil { return err } return nil diff --git a/fs-v1-multipart.go b/fs-v1-multipart.go index 4b305da99..ed165108c 100644 --- a/fs-v1-multipart.go +++ b/fs-v1-multipart.go @@ -229,14 +229,14 @@ func (fs fsObjects) newMultipartUpload(bucket string, object string, meta map[st return "", err } uploadIDPath := path.Join(mpartMetaPrefix, bucket, object, uploadID) - tempUploadIDPath := path.Join(tmpMetaPrefix, uploadID) - if err = fs.writeFSMetadata(minioMetaBucket, tempUploadIDPath, fsMeta); err != nil { - return "", toObjectErr(err, minioMetaBucket, tempUploadIDPath) + tempFSMetadataPath := path.Join(tmpMetaPrefix, getUUID()+"-"+fsMetaJSONFile) + if err = fs.writeTempFSMetadata(minioMetaBucket, tempFSMetadataPath, fsMeta); err != nil { + return "", toObjectErr(err, minioMetaBucket, tempFSMetadataPath) } - err = fs.storage.RenameFile(minioMetaBucket, path.Join(tempUploadIDPath, fsMetaJSONFile), minioMetaBucket, path.Join(uploadIDPath, fsMetaJSONFile)) + err = fs.storage.RenameFile(minioMetaBucket, tempFSMetadataPath, minioMetaBucket, path.Join(uploadIDPath, fsMetaJSONFile)) if err != nil { - if dErr := fs.storage.DeleteFile(minioMetaBucket, path.Join(tempUploadIDPath, fsMetaJSONFile)); dErr != nil { - return "", toObjectErr(dErr, minioMetaBucket, tempUploadIDPath) + if dErr := fs.storage.DeleteFile(minioMetaBucket, tempFSMetadataPath); dErr != nil { + return "", toObjectErr(dErr, minioMetaBucket, tempFSMetadataPath) } return "", toObjectErr(err, minioMetaBucket, uploadIDPath) } @@ -298,7 +298,7 @@ func (fs fsObjects) PutObjectPart(bucket, object, uploadID string, partID int, s defer nsMutex.Unlock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, object, uploadID, strconv.Itoa(partID))) partSuffix := fmt.Sprintf("object%d", partID) - tmpPartPath := path.Join(tmpMetaPrefix, uploadID, partSuffix) + tmpPartPath := path.Join(tmpMetaPrefix, uploadID+"-"+partSuffix) // Initialize md5 writer. md5Writer := md5.New() @@ -385,14 +385,14 @@ func (fs fsObjects) PutObjectPart(bucket, object, uploadID string, partID int, s return "", toObjectErr(err, minioMetaBucket, partPath) } uploadIDPath = path.Join(mpartMetaPrefix, bucket, object, uploadID) - tempUploadIDPath := path.Join(tmpMetaPrefix, uploadID) - if err = fs.writeFSMetadata(minioMetaBucket, tempUploadIDPath, fsMeta); err != nil { - return "", toObjectErr(err, minioMetaBucket, tempUploadIDPath) + tempFSMetadataPath := path.Join(tmpMetaPrefix, getUUID()+"-"+fsMetaJSONFile) + if err = fs.writeTempFSMetadata(minioMetaBucket, tempFSMetadataPath, fsMeta); err != nil { + return "", toObjectErr(err, minioMetaBucket, tempFSMetadataPath) } - err = fs.storage.RenameFile(minioMetaBucket, path.Join(tempUploadIDPath, fsMetaJSONFile), minioMetaBucket, path.Join(uploadIDPath, fsMetaJSONFile)) + err = fs.storage.RenameFile(minioMetaBucket, tempFSMetadataPath, minioMetaBucket, path.Join(uploadIDPath, fsMetaJSONFile)) if err != nil { - if dErr := fs.storage.DeleteFile(minioMetaBucket, path.Join(tempUploadIDPath, fsMetaJSONFile)); dErr != nil { - return "", toObjectErr(dErr, minioMetaBucket, tempUploadIDPath) + if dErr := fs.storage.DeleteFile(minioMetaBucket, tempFSMetadataPath); dErr != nil { + return "", toObjectErr(dErr, minioMetaBucket, tempFSMetadataPath) } return "", toObjectErr(err, minioMetaBucket, uploadIDPath) } @@ -525,7 +525,7 @@ func (fs fsObjects) CompleteMultipartUpload(bucket string, object string, upload return "", err } - tempObj := path.Join(tmpMetaPrefix, uploadID, "part.1") + tempObj := path.Join(tmpMetaPrefix, uploadID+"-"+"part.1") // Allocate staging buffer. var buf = make([]byte, readSizeV1) diff --git a/xl-v1-multipart.go b/xl-v1-multipart.go index 6392c0a6c..5ce2f86b3 100644 --- a/xl-v1-multipart.go +++ b/xl-v1-multipart.go @@ -364,7 +364,7 @@ func (xl xlObjects) PutObjectPart(bucket, object, uploadID string, partID int, s // accommodate concurrent PutObjectPart requests partSuffix := fmt.Sprintf("part.%d", partID) tmpSuffix := getUUID() - tmpPartPath := path.Join(tmpMetaPrefix, uploadID, tmpSuffix) + tmpPartPath := path.Join(tmpMetaPrefix, tmpSuffix) // Initialize md5 writer. md5Writer := md5.New()