mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/chrislusf/seaweedfs synced 2024-06-01 16:22:43 +02:00
Code Issues Projects Releases Wiki Activity

fix: panic: assignment to entry in nil map on S3Sink.CreateEntry (#5406)

Browse source
This commit is contained in:
Konstantin Lebedev 2024-03-21 20:12:31 +05:00 committed by GitHub
parent 8b18dd940f
commit 25643cfbc6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
weed/replication/sink/s3sink/s3_sink.go
View file

@ -175,19 +175,24 @@ func (s3sink *S3Sink) CreateEntry(key string, entry *filer_pb.Entry, signatures
uploader.PartSize = 0 uploader.PartSize = 0
} }
} }
if _, ok := entry.Extended[s3_constants.AmzUserMetaMtime]; !ok {
doSaveMtime := true
if entry.Extended == nil {
entry.Extended = make(map[string][]byte)
} else if _, ok := entry.Extended[s3_constants.AmzUserMetaMtime]; ok {
doSaveMtime = false
}
if doSaveMtime {
entry.Extended[s3_constants.AmzUserMetaMtime] = []byte(strconv.FormatInt(entry.Attributes.Mtime, 10)) entry.Extended[s3_constants.AmzUserMetaMtime] = []byte(strconv.FormatInt(entry.Attributes.Mtime, 10))
} }
// process tagging // process tagging
tags := "" tags := ""
if true {
for k, v := range entry.Extended { for k, v := range entry.Extended {
if len(tags) > 0 { if len(tags) > 0 {
tags = tags + "&" tags = tags + "&"
} }
tags = tags + k + "=" + string(v) tags = tags + k + "=" + string(v)
} }
}
// Upload the file to S3. // Upload the file to S3.
uploadInput := s3manager.UploadInput{ uploadInput := s3manager.UploadInput{