mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-15 02:28:31 +02:00
* pb: add multipart concurrency fields to RemoteConf and tier move requests RemoteConf gains upload_concurrency/download_concurrency (0 = client default); VolumeTierMoveDatToRemote/FromRemote requests gain a concurrency field (0 = backend default). * remote storage: honor RemoteConf upload/download concurrency in s3 and azure clients s3 client: ReadFile passes conf download_concurrency to the downloader, WriteFile uses upload_concurrency for the uploader; previously hard-coded 1 upload / 5 download parts. 0 keeps defaults. Same for azure client. * storage: plumb concurrency through backend interface and tier upload/download BackendStorage.CopyFile/DownloadFile take a concurrency hint (<=0 = backend configured default); s3 backend reads upload_concurrency/download_concurrency from scaffold config with parseConcurrency fallback, rclone updated to the new signature. Tier move gRPC handlers forward the request concurrency to the backend. * shell: -upload_concurrency/-download_concurrency for remote.configure, -concurrent for volume.tier remote.configure exposes upload/download concurrency persisted into RemoteConf; volume.tier move/evict commands forward -concurrent to the tier move requests. Documented in master-cloud.toml scaffold. * test: cover concurrency propagation in remote tier integration test * remote.configure: merge existing config on partial update Load the stored RemoteConf before saving so a partial update (e.g. only -upload_concurrency) preserves credentials, endpoints, and type instead of replacing them with new-config defaults. Only treat a confirmed ErrNotFound as a new configuration; propagate all other load errors so a transient filer failure does not overwrite stored settings. On a type transition, reset backend-specific fields to the destination type's new-config defaults rather than inheriting the old backend's empty values. Bound configured concurrency to a sane maximum. * remote storage: honor configured download concurrency in S3 and Azure ReadFileWithConcurrency now resolves a zero request override against the client's configured download_concurrency (new downloadConcurrency() helpers), so the remote-mount/cache read path honors RemoteConf.DownloadConcurrency instead of the hard-coded default. Azure also clamps the resolved value to math.MaxUint16 regardless of whether the fallback was used, preventing uint16 wraparound when a configured value exceeds 65535. * shell: rename -concurrent to -concurrency and validate tier transfer bounds Rename the -concurrent flag to -concurrency across volume.tier.upload, volume.tier.download, and volume.tier.compact to match the proto field and RemoteConf field names. Add validateTierConcurrency to reject values that would wrap int32 or exceed a 1024 cap before constructing the request. * server: clamp tier move concurrency in gRPC handlers Add clampTierConcurrency to both VolumeTierMoveDatToRemote and VolumeTierMoveDatFromRemote handlers so a direct gRPC caller cannot spawn an unbounded number of network workers. * trim verbose comments added with concurrency feature Remove redundant doc comments on the backend interface, rclone backend, s3_backend parseConcurrency, and test helpers that restated the obvious. * remote.configure: apply type defaults before re-parse so explicit flags win applyTypeDefaults ran after the second flag parse, overwriting explicit destination flags (e.g. -s3.region=eu-west-1) with new-config defaults. Move the type-transition default reset before the re-parse so user-supplied flags override the destination defaults. * remote.configure: only treat explicit -type as a type transition The first parse defaults -type to s3, so a concurrency-only update on an existing non-S3 config captured requestedType=s3 and wrongly triggered a type transition, resetting the stored backend to S3. Use fs.Visit to detect whether -type was explicitly supplied; an omitted -type keeps the stored backend. --------- Co-authored-by: Jack Meredith <9480542+jackusm@users.noreply.github.com> Co-authored-by: Chris Lu <chris.lu@gmail.com>
113 lines
2.7 KiB
Go
113 lines
2.7 KiB
Go
package s3_backend
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"sync"
|
|
|
|
"github.com/aws/aws-sdk-go/aws"
|
|
"github.com/aws/aws-sdk-go/service/s3/s3iface"
|
|
"github.com/aws/aws-sdk-go/service/s3/s3manager"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
)
|
|
|
|
func uploadToS3(sess s3iface.S3API, filename string, destBucket string, destKey string, storageClass string, fn func(progressed int64, percentage float32) error, concurrency int) (fileSize int64, err error) {
|
|
if concurrency <= 0 {
|
|
concurrency = defaultUploadConcurrency
|
|
}
|
|
|
|
//open the file
|
|
f, err := os.Open(filename)
|
|
if err != nil {
|
|
return 0, fmt.Errorf("failed to open file %q, %v", filename, err)
|
|
}
|
|
defer f.Close()
|
|
|
|
info, err := f.Stat()
|
|
if err != nil {
|
|
return 0, fmt.Errorf("failed to stat file %q, %v", filename, err)
|
|
}
|
|
|
|
fileSize = info.Size()
|
|
|
|
partSize := int64(64 * 1024 * 1024) // The minimum/default allowed part size is 5MB
|
|
for partSize*1000 < fileSize {
|
|
partSize *= 4
|
|
}
|
|
|
|
// Create an uploader with the session and custom options
|
|
uploader := s3manager.NewUploaderWithClient(sess, func(u *s3manager.Uploader) {
|
|
u.PartSize = partSize
|
|
u.Concurrency = concurrency
|
|
})
|
|
|
|
fileReader := &s3UploadProgressedReader{
|
|
fp: f,
|
|
size: fileSize,
|
|
signMap: map[int64]struct{}{},
|
|
fn: fn,
|
|
}
|
|
|
|
// Upload the file to S3.
|
|
var result *s3manager.UploadOutput
|
|
result, err = uploader.Upload(&s3manager.UploadInput{
|
|
Bucket: aws.String(destBucket),
|
|
Key: aws.String(destKey),
|
|
Body: fileReader,
|
|
StorageClass: aws.String(storageClass),
|
|
})
|
|
|
|
//in case it fails to upload
|
|
if err != nil {
|
|
return 0, fmt.Errorf("failed to upload file %s: %v", filename, err)
|
|
}
|
|
glog.V(1).Infof("file %s uploaded to %s\n", filename, result.Location)
|
|
|
|
return
|
|
}
|
|
|
|
// adapted from https://github.com/aws/aws-sdk-go/pull/1868
|
|
// https://github.com/aws/aws-sdk-go/blob/main/example/service/s3/putObjectWithProcess/putObjWithProcess.go
|
|
type s3UploadProgressedReader struct {
|
|
fp *os.File
|
|
size int64
|
|
read int64
|
|
signMap map[int64]struct{}
|
|
mux sync.Mutex
|
|
fn func(progressed int64, percentage float32) error
|
|
}
|
|
|
|
func (r *s3UploadProgressedReader) Read(p []byte) (int, error) {
|
|
return r.fp.Read(p)
|
|
}
|
|
|
|
func (r *s3UploadProgressedReader) ReadAt(p []byte, off int64) (int, error) {
|
|
n, err := r.fp.ReadAt(p, off)
|
|
if err != nil {
|
|
return n, err
|
|
}
|
|
|
|
r.mux.Lock()
|
|
// Ignore the first signature call
|
|
if _, ok := r.signMap[off]; ok {
|
|
r.read += int64(n)
|
|
} else {
|
|
r.signMap[off] = struct{}{}
|
|
}
|
|
r.mux.Unlock()
|
|
|
|
if r.fn != nil {
|
|
read := r.read
|
|
if err := r.fn(read, float32(read*100)/float32(r.size)); err != nil {
|
|
return n, err
|
|
}
|
|
}
|
|
|
|
return n, err
|
|
}
|
|
|
|
func (r *s3UploadProgressedReader) Seek(offset int64, whence int) (int64, error) {
|
|
return r.fp.Seek(offset, whence)
|
|
}
|