mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-23 06:20:48 +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>
161 lines
5.9 KiB
Go
161 lines
5.9 KiB
Go
package weed_server
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"runtime"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/backend"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/needle"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/volume_info"
|
|
)
|
|
|
|
// VolumeTierMoveDatFromRemote copy dat file from a remote tier to local volume server
|
|
func (vs *VolumeServer) VolumeTierMoveDatFromRemote(req *volume_server_pb.VolumeTierMoveDatFromRemoteRequest, stream volume_server_pb.VolumeServer_VolumeTierMoveDatFromRemoteServer) error {
|
|
if err := vs.checkGrpcAdminAuth(stream.Context()); err != nil {
|
|
return err
|
|
}
|
|
|
|
// find existing volume
|
|
v := vs.store.GetVolume(needle.VolumeId(req.VolumeId))
|
|
if v == nil {
|
|
return fmt.Errorf("volume %d not found", req.VolumeId)
|
|
}
|
|
|
|
// verify the collection
|
|
if v.Collection != req.Collection {
|
|
return fmt.Errorf("existing collection:%v unexpected input: %v", v.Collection, req.Collection)
|
|
}
|
|
|
|
// locate the disk file
|
|
storageName, storageKey := v.RemoteStorageNameKey()
|
|
if storageName == "" || storageKey == "" {
|
|
return fmt.Errorf("volume %d is already on local disk", req.VolumeId)
|
|
}
|
|
remoteFileModifiedTime := v.GetVolumeInfo().GetFiles()[0].GetModifiedTime()
|
|
|
|
// check whether the local .dat already exists
|
|
_, ok := v.DataBackend.(*backend.DiskFile)
|
|
if ok {
|
|
return fmt.Errorf("volume %d is already on local disk", req.VolumeId)
|
|
}
|
|
|
|
// check valid storage backend type
|
|
backendStorage, found := backend.BackendStorages[storageName]
|
|
if !found {
|
|
var keys []string
|
|
for key := range backend.BackendStorages {
|
|
keys = append(keys, key)
|
|
}
|
|
return fmt.Errorf("remote storage %s not found from supported: %v", storageName, keys)
|
|
}
|
|
|
|
startTime := time.Now()
|
|
fn := func(progressed int64, percentage float32) error {
|
|
now := time.Now()
|
|
if now.Sub(startTime) < time.Second {
|
|
return nil
|
|
}
|
|
startTime = now
|
|
return stream.Send(&volume_server_pb.VolumeTierMoveDatFromRemoteResponse{
|
|
Processed: progressed,
|
|
ProcessedPercentage: percentage,
|
|
})
|
|
}
|
|
// copy the data file (DownloadFile opens, fsyncs, and closes the .dat internally)
|
|
datFileName := v.FileName(".dat")
|
|
_, err := backendStorage.DownloadFile(datFileName, storageKey, fn, clampTierConcurrency(int(req.Concurrency)))
|
|
if err != nil {
|
|
return fmt.Errorf("backend %s copy file %s: %v", storageName, datFileName, err)
|
|
}
|
|
if remoteFileModifiedTime > 0 {
|
|
modifiedTime := time.Unix(int64(remoteFileModifiedTime), 0)
|
|
// best-effort: a cosmetic mtime failure should not abort an otherwise
|
|
// complete tier-down, matching the EC copy path
|
|
if err := os.Chtimes(v.FileName(".dat"), modifiedTime, modifiedTime); err != nil {
|
|
glog.Warningf("volume %d restore data file %s modified time: %v", v.Id, v.FileName(".dat"), err)
|
|
}
|
|
}
|
|
|
|
// fsync the containing directory so the new .dat and the about-to-be-rewritten
|
|
// .vif are durably linked before we touch the shared remote object.
|
|
if err := fsyncDir(filepath.Dir(datFileName)); err != nil {
|
|
return fmt.Errorf("volume %d fsync dir for %s: %v", v.Id, datFileName, err)
|
|
}
|
|
|
|
// Trim the remote file reference and persist the .vif (util.WriteFile fsyncs it)
|
|
// BEFORE deleting the remote object. After this the .vif no longer references the
|
|
// remote object, so a crash before DeleteFile merely leaks the remote object while
|
|
// the volume reloads its local .dat as non-remote. The volume must NEVER be left
|
|
// with a .vif referencing the remote object while that object is deleted.
|
|
v.GetVolumeInfo().Files = v.GetVolumeInfo().Files[1:]
|
|
if err := v.SaveVolumeInfo(); err != nil {
|
|
var ndErr *volume_info.NotCrashDurableError
|
|
if !errors.As(err, &ndErr) {
|
|
return fmt.Errorf("volume %d failed to save remote file info: %v", v.Id, err)
|
|
}
|
|
// The .vif is committed but may not be crash-durable. Continue
|
|
// with the backend switch and remote deletion since the metadata
|
|
// already reflects the local-only state.
|
|
glog.Warningf("volume %d saved remote file info but not crash-durable: %v", v.Id, err)
|
|
}
|
|
|
|
// fsync the directory again so the rewritten .vif is durable.
|
|
if err := fsyncDir(filepath.Dir(datFileName)); err != nil {
|
|
return fmt.Errorf("volume %d fsync dir after saving volume info: %v", v.Id, err)
|
|
}
|
|
|
|
// Swap the data backend from the remote storage to the now-local .dat on BOTH
|
|
// paths, so a KeepRemoteDatFile=true download still leaves the replica serving
|
|
// from local disk (hasRemoteFile=false) rather than the shared remote object.
|
|
if err := swapToLocalDatBackend(v, datFileName); err != nil {
|
|
return fmt.Errorf("volume %d failed to open local dat file %s: %v", v.Id, datFileName, err)
|
|
}
|
|
|
|
if req.KeepRemoteDatFile {
|
|
// Surviving replicas still reference this object; keep it intact.
|
|
return nil
|
|
}
|
|
|
|
// remove remote file: only the last replica to download deletes the shared object.
|
|
if err := backendStorage.DeleteFile(storageKey); err != nil {
|
|
return fmt.Errorf("volume %d failed to delete remote file %s: %v", v.Id, storageKey, err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// swapToLocalDatBackend closes the remote data backend and opens the downloaded
|
|
// local .dat as a DiskFile so reads are served from local disk.
|
|
func swapToLocalDatBackend(v *storage.Volume, datFileName string) error {
|
|
dataFile, err := backend.OpenVolumeFile(datFileName, os.O_RDWR)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
// Swap under the volume's data lock so concurrent reads never see a closed
|
|
// or half-swapped backend, clearing hasRemoteFile in the same step since the
|
|
// volume now serves from the local .dat.
|
|
v.SwapDataBackend(backend.NewDiskFile(dataFile), false)
|
|
return nil
|
|
}
|
|
|
|
// fsyncDir flushes a directory entry so renamed/created files within it survive
|
|
// a crash. Directory fsync is unsupported on Windows, so it is skipped there.
|
|
func fsyncDir(dir string) error {
|
|
if runtime.GOOS == "windows" {
|
|
return nil
|
|
}
|
|
d, err := os.Open(dir)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer d.Close()
|
|
return d.Sync()
|
|
}
|