mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/chrislusf/seaweedfs synced 2024-07-02 15:16:51 +02:00
Code Issues Projects Releases Wiki Activity

s3 sink use s3 upload manager

Browse source 
fix https://github.com/seaweedfs/seaweedfs/issues/3531
This commit is contained in:
chrislu 2022-08-26 23:47:12 -07:00
parent 3f3a1341d8
commit c839ce1b19
1 changed files with 31 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,17 +1,14 @@
package S3Sink package S3Sink
import ( import (
"bytes"
"context"
"fmt" "fmt"
"strings"
"sync"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
"github.com/aws/aws-sdk-go/service/s3/s3iface" "github.com/aws/aws-sdk-go/service/s3/s3iface"
"github.com/aws/aws-sdk-go/service/s3/s3manager"
"strings"
"github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/filer"
"github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/glog"
@ -109,57 +106,48 @@ func (s3sink *S3Sink) DeleteEntry(key string, isDirectory, deleteIncludeChunks b
} }
func (s3sink *S3Sink) CreateEntry(key string, entry *filer_pb.Entry, signatures []int32) error { func (s3sink *S3Sink) CreateEntry(key string, entry *filer_pb.Entry, signatures []int32) (err error) {
key = cleanKey(key) key = cleanKey(key)
if entry.IsDirectory { if entry.IsDirectory {
return nil return nil
} }
uploadId, err := s3sink.createMultipartUpload(key, entry) reader := filer.NewFileReader(s3sink.filerSource, entry)
if err != nil {
return fmt.Errorf("createMultipartUpload: %v", err) fileSize := int64(filer.FileSize(entry))
partSize := int64(8 * 1024 * 1024) // The minimum/default allowed part size is 5MB
for partSize*1000 < fileSize {
partSize *= 4
} }
totalSize := filer.FileSize(entry) // Create an uploader with the session and custom options
uploader := s3manager.NewUploaderWithClient(s3sink.conn, func(u *s3manager.Uploader) {
u.PartSize = partSize
u.Concurrency = 8
})
chunkViews := filer.ViewFromChunks(s3sink.filerSource.LookupFileId, entry.Chunks, 0, int64(totalSize)) // process tagging
tags := ""
parts := make([]*s3.CompletedPart, len(chunkViews)) if true {
for k, v := range entry.Extended {
if len(parts) > 0 { if len(tags) > 0 {
var wg sync.WaitGroup tags = tags + "&"
for chunkIndex, chunk := range chunkViews {
partId := chunkIndex + 1
wg.Add(1)
go func(chunk *filer.ChunkView, index int) {
defer wg.Done()
if part, uploadErr := s3sink.uploadPart(key, uploadId, partId, chunk); uploadErr != nil {
err = uploadErr
glog.Errorf("uploadPart: %v", uploadErr)
} else {
parts[index] = part
} }
}(chunk, chunkIndex) tags = tags + k + "=" + string(v)
}
wg.Wait()
} else if len(entry.Content) > 0 {
// for small files
if part, uploadErr := s3sink.doUploadPart(key, uploadId, 1, bytes.NewReader(entry.Content)); uploadErr != nil {
err = uploadErr
glog.Errorf("uploadPart: %v", uploadErr)
} else {
parts = make([]*s3.CompletedPart, 1)
parts[0] = part
} }
} }
if err != nil { // Upload the file to S3.
s3sink.abortMultipartUpload(key, uploadId) _, err = uploader.Upload(&s3manager.UploadInput{
return fmt.Errorf("uploadPart: %v", err) Bucket: aws.String(s3sink.bucket),
} Key: aws.String(key),
Body: reader,
Tagging: aws.String(tags),
})
return s3sink.completeMultipartUpload(context.Background(), key, uploadId, parts) return
} }