astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-07-19 04:00:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

xl/fs: Bring in ".minio/tmp" directory support. (#1464)

Browse Source 
All transactions happen through this directory inside ".minio/temp".
Adding this allows us to remove any temporary files which were not
committed before.

Fixes #1462
Fixes #1444
This commit is contained in:
Harshavardhana
2016-05-03 16:10:24 -07:00
committed by Anand Babu (AB) Periasamy
parent 6f1811ee4d
commit d0e854afb7
7 changed files with 497 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files
object-common.go
+9 -19
View File
@@ -105,13 +105,13 @@ func deleteBucket(storage StorageAPI, bucket string) error {
func putObjectCommon(storage StorageAPI, bucket string, object string, size int64, data io.Reader, metadata map[string]string) (string, error) {
// Verify if bucket is valid.
if !IsValidBucketName(bucket) {
return "", (BucketNameInvalid{Bucket: bucket})
return "", BucketNameInvalid{Bucket: bucket}
}
if !IsValidObjectName(object) {
return "", (ObjectNameInvalid{
return "", ObjectNameInvalid{
Bucket: bucket,
Object: object,
})
}
}
// Check whether the bucket exists.
if isExist, err := isBucketExist(storage, bucket); err != nil {
@@ -120,7 +120,8 @@ func putObjectCommon(storage StorageAPI, bucket string, object string, size int6
return "", BucketNotFound{Bucket: bucket}
}
fileWriter, err := storage.CreateFile(bucket, object)
tempObj := path.Join(tmpMetaPrefix, bucket, object)
fileWriter, err := storage.CreateFile(minioMetaBucket, tempObj)
if err != nil {
return "", toObjectErr(err, bucket, object)
}
@@ -166,26 +167,15 @@ func putObjectCommon(storage StorageAPI, bucket string, object string, size int6
if err != nil {
return "", err
}
err = storage.RenameFile(minioMetaBucket, tempObj, bucket, object)
if err != nil {
return "", err
}
// Return md5sum, successfully wrote object.
return newMD5Hex, nil
}
// isUploadIDExists - verify if a given uploadID exists and is valid.
func isUploadIDExists(storage StorageAPI, bucket, object, uploadID string) (bool, error) {
uploadIDPath := path.Join(bucket, object, uploadID)
st, err := storage.StatFile(minioMetaBucket, uploadIDPath)
if err != nil {
// Upload id does not exist.
if err == errFileNotFound {
return false, nil
}
return false, err
}
// Upload id exists and is a regular file.
return st.Mode.IsRegular(), nil
}
// checks whether bucket exists.
func isBucketExist(storage StorageAPI, bucketName string) (bool, error) {
// Check whether bucket exists.