MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fs: Enable fs.json with env MINIO_ENABLE_FSMETA

This commit is contained in:
Harshavardhana 2016-08-15 15:20:06 -07:00
parent 51d7749c3e
commit 0e745fdb05
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs-v1-metadata.go
View File

@ -18,6 +18,7 @@ package main
import ( import (
"encoding/json" "encoding/json"
"os"
"path" "path"
"sort" "sort"
"strings" "strings"
@ -161,6 +162,9 @@ func isExtendedHeader(header string) bool {
// Return true if extended HTTP headers are set, false otherwise. // Return true if extended HTTP headers are set, false otherwise.
func hasExtendedHeader(metadata map[string]string) bool { func hasExtendedHeader(metadata map[string]string) bool {
if os.Getenv("MINIO_ENABLE_FSMETA") == "1" {
return true
}
for k := range metadata { for k := range metadata {
if isExtendedHeader(k) { if isExtendedHeader(k) {
return true return true

7
fs-v1-multipart.go
View File

@ -588,8 +588,13 @@ func (fs fsObjects) CompleteMultipartUpload(bucket string, object string, upload
// Save additional metadata only if extended headers such as "X-Amz-Meta-" are set. // Save additional metadata only if extended headers such as "X-Amz-Meta-" are set.
if hasExtendedHeader(fsMeta.Meta) { if hasExtendedHeader(fsMeta.Meta) {
fsMeta.Meta["md5Sum"] = s3MD5 fsMeta.Meta["md5Sum"] = s3MD5
uniqueID := getUUID()
fsMetaTmp := path.Join(tmpMetaPrefix, uniqueID)
if err = writeFSMetadata(fs.storage, minioMetaBucket, fsMetaTmp, fsMeta); err != nil {
return "", toObjectErr(err, bucket, object)
}
fsMetaPath := path.Join(bucketMetaPrefix, bucket, object, fsMetaJSONFile) fsMetaPath := path.Join(bucketMetaPrefix, bucket, object, fsMetaJSONFile)
if err = writeFSMetadata(fs.storage, minioMetaBucket, fsMetaPath, fsMeta); err != nil { if err = fs.storage.RenameFile(minioMetaBucket, fsMetaTmp, minioMetaBucket, fsMetaPath); err != nil {
return "", toObjectErr(err, bucket, object) return "", toObjectErr(err, bucket, object)
} }
} }