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

Merge pull request #870 from harshavardhana/disable-multipart

Browse Source 
Disable multipart for donut backend from being used
This commit is contained in:
Harshavardhana 2015-09-24 18:56:53 -07:00
commit e793431852
1 changed files with 53 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
pkg/donut/multipart.go
View File

@ -59,9 +59,9 @@ func (donut API) NewMultipartUpload(bucket, key, contentType string, signature *
return "", probe.NewError(SignatureDoesNotMatch{}) return "", probe.NewError(SignatureDoesNotMatch{})
} }
} }
if len(donut.config.NodeDiskMap) > 0 { // if len(donut.config.NodeDiskMap) > 0 {
return donut.newMultipartUpload(bucket, key, contentType) // return donut.newMultipartUpload(bucket, key, contentType)
} // }
if !donut.storedBuckets.Exists(bucket) { if !donut.storedBuckets.Exists(bucket) {
return "", probe.NewError(BucketNotFound{Bucket: bucket}) return "", probe.NewError(BucketNotFound{Bucket: bucket})
} }
@ -107,9 +107,12 @@ func (donut API) AbortMultipartUpload(bucket, key, uploadID string, signature *S
return probe.NewError(SignatureDoesNotMatch{}) return probe.NewError(SignatureDoesNotMatch{})
} }
} }
if len(donut.config.NodeDiskMap) > 0 { // TODO: multipart support for donut is broken, since we haven't finalized the format in which
return donut.abortMultipartUpload(bucket, key, uploadID) // it can be stored, disabling this for now until we get the underlying layout stable.
} //
// if len(donut.config.NodeDiskMap) > 0 {
// return donut.abortMultipartUpload(bucket, key, uploadID)
// }
if !donut.storedBuckets.Exists(bucket) { if !donut.storedBuckets.Exists(bucket) {
return probe.NewError(BucketNotFound{Bucket: bucket}) return probe.NewError(BucketNotFound{Bucket: bucket})
} }
@ -140,28 +143,32 @@ func (donut API) createObjectPart(bucket, key, uploadID string, partID int, cont
if !IsValidObjectName(key) { if !IsValidObjectName(key) {
return "", probe.NewError(ObjectNameInvalid{Object: key}) return "", probe.NewError(ObjectNameInvalid{Object: key})
} }
if len(donut.config.NodeDiskMap) > 0 { // TODO: multipart support for donut is broken, since we haven't finalized the format in which
metadata := make(map[string]string) // it can be stored, disabling this for now until we get the underlying layout stable.
if contentType == "" { //
contentType = "application/octet-stream" /*
} if len(donut.config.NodeDiskMap) > 0 {
contentType = strings.TrimSpace(contentType) metadata := make(map[string]string)
metadata["contentType"] = contentType if contentType == "" {
if strings.TrimSpace(expectedMD5Sum) != "" { contentType = "application/octet-stream"
expectedMD5SumBytes, err := base64.StdEncoding.DecodeString(strings.TrimSpace(expectedMD5Sum))
if err != nil {
// pro-actively close the connection
return "", probe.NewError(InvalidDigest{Md5: expectedMD5Sum})
} }
expectedMD5Sum = hex.EncodeToString(expectedMD5SumBytes) contentType = strings.TrimSpace(contentType)
metadata["contentType"] = contentType
if strings.TrimSpace(expectedMD5Sum) != "" {
expectedMD5SumBytes, err := base64.StdEncoding.DecodeString(strings.TrimSpace(expectedMD5Sum))
if err != nil {
// pro-actively close the connection
return "", probe.NewError(InvalidDigest{Md5: expectedMD5Sum})
}
expectedMD5Sum = hex.EncodeToString(expectedMD5SumBytes)
}
partMetadata, err := donut.putObjectPart(bucket, key, expectedMD5Sum, uploadID, partID, data, size, metadata, signature)
if err != nil {
return "", err.Trace()
}
return partMetadata.ETag, nil
} }
partMetadata, err := donut.putObjectPart(bucket, key, expectedMD5Sum, uploadID, partID, data, size, metadata, signature) */
if err != nil {
return "", err.Trace()
}
return partMetadata.ETag, nil
}
if !donut.storedBuckets.Exists(bucket) { if !donut.storedBuckets.Exists(bucket) {
return "", probe.NewError(BucketNotFound{Bucket: bucket}) return "", probe.NewError(BucketNotFound{Bucket: bucket})
} }
@ -277,10 +284,13 @@ func (donut API) CompleteMultipartUpload(bucket, key, uploadID string, data io.R
donut.lock.Unlock() donut.lock.Unlock()
return ObjectMetadata{}, probe.NewError(ObjectNameInvalid{Object: key}) return ObjectMetadata{}, probe.NewError(ObjectNameInvalid{Object: key})
} }
if len(donut.config.NodeDiskMap) > 0 { // TODO: multipart support for donut is broken, since we haven't finalized the format in which
donut.lock.Unlock() // it can be stored, disabling this for now until we get the underlying layout stable.
return donut.completeMultipartUpload(bucket, key, uploadID, data, signature) //
} // if len(donut.config.NodeDiskMap) > 0 {
// donut.lock.Unlock()
// return donut.completeMultipartUpload(bucket, key, uploadID, data, signature)
// }
if !donut.storedBuckets.Exists(bucket) { if !donut.storedBuckets.Exists(bucket) {
donut.lock.Unlock() donut.lock.Unlock()
@ -376,7 +386,7 @@ func (a byKey) Less(i, j int) bool { return a[i].Key < a[j].Key }
// ListMultipartUploads - list incomplete multipart sessions for a given bucket // ListMultipartUploads - list incomplete multipart sessions for a given bucket
func (donut API) ListMultipartUploads(bucket string, resources BucketMultipartResourcesMetadata, signature *Signature) (BucketMultipartResourcesMetadata, *probe.Error) { func (donut API) ListMultipartUploads(bucket string, resources BucketMultipartResourcesMetadata, signature *Signature) (BucketMultipartResourcesMetadata, *probe.Error) {
// TODO handle delimiter // TODO handle delimiter, low priority
donut.lock.Lock() donut.lock.Lock()
defer donut.lock.Unlock() defer donut.lock.Unlock()
@ -394,9 +404,12 @@ func (donut API) ListMultipartUploads(bucket string, resources BucketMultipartRe
return BucketMultipartResourcesMetadata{}, probe.NewError(BucketNameInvalid{Bucket: bucket}) return BucketMultipartResourcesMetadata{}, probe.NewError(BucketNameInvalid{Bucket: bucket})
} }
if len(donut.config.NodeDiskMap) > 0 { // TODO: multipart support for donut is broken, since we haven't finalized the format in which
return donut.listMultipartUploads(bucket, resources) // it can be stored, disabling this for now until we get the underlying layout stable.
} //
// if len(donut.config.NodeDiskMap) > 0 {
// return donut.listMultipartUploads(bucket, resources)
// }
if !donut.storedBuckets.Exists(bucket) { if !donut.storedBuckets.Exists(bucket) {
return BucketMultipartResourcesMetadata{}, probe.NewError(BucketNotFound{Bucket: bucket}) return BucketMultipartResourcesMetadata{}, probe.NewError(BucketNotFound{Bucket: bucket})
@ -479,9 +492,12 @@ func (donut API) ListObjectParts(bucket, key string, resources ObjectResourcesMe
return ObjectResourcesMetadata{}, probe.NewError(ObjectNameInvalid{Object: key}) return ObjectResourcesMetadata{}, probe.NewError(ObjectNameInvalid{Object: key})
} }
if len(donut.config.NodeDiskMap) > 0 { // TODO: multipart support for donut is broken, since we haven't finalized the format in which
return donut.listObjectParts(bucket, key, resources) // it can be stored, disabling this for now until we get the underlying layout stable.
} //
// if len(donut.config.NodeDiskMap) > 0 {
// return donut.listObjectParts(bucket, key, resources)
// }
if !donut.storedBuckets.Exists(bucket) { if !donut.storedBuckets.Exists(bucket) {
return ObjectResourcesMetadata{}, probe.NewError(BucketNotFound{Bucket: bucket}) return ObjectResourcesMetadata{}, probe.NewError(BucketNotFound{Bucket: bucket})