Merge pull request #1569 from taozix/master

save s3 metadata to filer.
This commit is contained in:
Chris Lu 2020-10-28 03:27:24 -07:00 committed by GitHub
commit 326fcdd86b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 1 deletions

View file

@ -97,7 +97,7 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request,
if r.Method == "GET" {
tagCount := 0
for k, _ := range entry.Extended {
if strings.HasPrefix(k, "x-amz-tagging-") {
if strings.HasPrefix(k, "X-Amz-Tagging-") {
tagCount++
}
}

View file

@ -176,6 +176,8 @@ func (fs *FilerServer) saveMetaData(ctx context.Context, r *http.Request, fileNa
Size: chunkOffset,
}
fs.saveAmzMetaData(r, entry)
if dbErr := fs.filer.CreateEntry(ctx, entry, false, false, nil); dbErr != nil {
fs.filer.DeleteChunks(entry.Chunks)
replyerr = dbErr
@ -308,3 +310,36 @@ func (fs *FilerServer) mkdir(ctx context.Context, w http.ResponseWriter, r *http
}
return filerResult, replyerr
}
func (fs *FilerServer) saveAmzMetaData(r *http.Request, entry *filer.Entry) {
var (
storageClass = "X-Amz-Storage-Class"
objectTagging = "X-Amz-Tagging"
userMetaPrefix = "X-Amz-Meta-"
)
if entry.Extended == nil {
entry.Extended = make(map[string][]byte)
}
if sc := r.Header.Get(storageClass); sc != "" {
entry.Extended[storageClass] = []byte(sc)
}
if tags := r.Header.Get(objectTagging); tags != "" {
for _, v := range strings.Split(tags, "&") {
tag := strings.Split(v, "=")
if len(tag) == 2 {
entry.Extended[objectTagging+"-"+tag[0]] = []byte(tag[1])
}
}
}
for header, values := range r.Header {
if strings.HasPrefix(header, userMetaPrefix) {
for _, value := range values {
entry.Extended[header] = []byte(value)
}
}
}
}