mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-09-17 12:00:44 +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>
324 lines
11 KiB
Go
324 lines
11 KiB
Go
package shell
|
|
|
|
import (
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"io"
|
|
|
|
"google.golang.org/grpc"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/operation"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/needle"
|
|
)
|
|
|
|
func init() {
|
|
Commands = append(Commands, &commandVolumeTierCompact{})
|
|
}
|
|
|
|
type commandVolumeTierCompact struct {
|
|
}
|
|
|
|
func (c *commandVolumeTierCompact) Name() string {
|
|
return "volume.tier.compact"
|
|
}
|
|
|
|
func (c *commandVolumeTierCompact) Help() string {
|
|
return `compact remote volumes to reclaim space on cloud storage
|
|
|
|
volume.tier.compact [-volumeId=<volume_id>] [-concurrency=<n>]
|
|
volume.tier.compact [-collection=""] [-garbageThreshold=0.3] [-concurrency=<n>]
|
|
|
|
e.g.:
|
|
volume.tier.compact -volumeId=7
|
|
volume.tier.compact -collection="mybucket" -garbageThreshold=0.2
|
|
|
|
This command compacts cloud tier volumes by:
|
|
1. Downloading the .dat file from remote storage to local
|
|
2. Running compaction to remove deleted data
|
|
3. Uploading the compacted .dat file back to remote storage
|
|
|
|
This reclaims space on remote storage that was used by deleted files.
|
|
|
|
`
|
|
}
|
|
|
|
func (c *commandVolumeTierCompact) HasTag(CommandTag) bool {
|
|
return false
|
|
}
|
|
|
|
type remoteVolumeInfo struct {
|
|
vid needle.VolumeId
|
|
collection string
|
|
remoteStorageName string
|
|
serverAddress pb.ServerAddress
|
|
serverUrl string
|
|
}
|
|
|
|
func (c *commandVolumeTierCompact) Do(args []string, commandEnv *CommandEnv, writer io.Writer) (err error) {
|
|
|
|
tierCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
|
|
volumeId := tierCommand.Int("volumeId", 0, "the volume id")
|
|
collection := tierCommand.String("collection", "", "comma-separated collection names, wildcards, or regex patterns; empty matches the collection with no name")
|
|
garbageThreshold := tierCommand.Float64("garbageThreshold", 0.3, "compact when garbage ratio exceeds this value")
|
|
concurrency := tierCommand.Int("concurrency", 0, "multipart transfer concurrency (0 = backend default)")
|
|
if err = tierCommand.Parse(args); err != nil {
|
|
return nil
|
|
}
|
|
|
|
if err = validateTierConcurrency(*concurrency); err != nil {
|
|
return err
|
|
}
|
|
|
|
if err = commandEnv.confirmIsLocked(args); err != nil {
|
|
return
|
|
}
|
|
|
|
vid := needle.VolumeId(*volumeId)
|
|
|
|
// collect topology information
|
|
topologyInfo, _, err := collectTopologyInfo(commandEnv, 0)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// find remote volumes
|
|
var remoteVolumes []remoteVolumeInfo
|
|
if vid != 0 {
|
|
rv, found, findErr := findRemoteVolumeInTopology(topologyInfo, vid, *collection)
|
|
if findErr != nil {
|
|
return findErr
|
|
}
|
|
if !found {
|
|
return fmt.Errorf("remote volume %d not found", vid)
|
|
}
|
|
remoteVolumes = append(remoteVolumes, rv)
|
|
} else {
|
|
remoteVolumes, err = collectRemoteVolumesWithInfo(topologyInfo, *collection)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
if len(remoteVolumes) == 0 {
|
|
fmt.Fprintf(writer, "no remote volumes found\n")
|
|
return nil
|
|
}
|
|
|
|
fmt.Fprintf(writer, "found %d remote volume(s) to check for compaction\n", len(remoteVolumes))
|
|
|
|
var failedCount int
|
|
for _, rv := range remoteVolumes {
|
|
if err = doVolumeTierCompact(commandEnv, writer, rv, *garbageThreshold, *concurrency); err != nil {
|
|
fmt.Fprintf(writer, "error compacting volume %d: %v\n", rv.vid, err)
|
|
failedCount++
|
|
}
|
|
}
|
|
|
|
if failedCount > 0 {
|
|
return fmt.Errorf("%d of %d volume(s) failed to compact", failedCount, len(remoteVolumes))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func findRemoteVolumeInTopology(topoInfo *master_pb.TopologyInfo, vid needle.VolumeId, collectionPattern string) (remoteVolumeInfo, bool, error) {
|
|
var matchesCollection func(string) bool
|
|
if collectionPattern != "" {
|
|
collectionMatcher, err := compileCollectionPattern(collectionPattern)
|
|
if err != nil {
|
|
return remoteVolumeInfo{}, false, fmt.Errorf("invalid collection pattern '%s': %v", collectionPattern, err)
|
|
}
|
|
matchesCollection = collectionMatcher.Matches
|
|
} else {
|
|
matchesCollection = func(string) bool { return true }
|
|
}
|
|
|
|
var result remoteVolumeInfo
|
|
found := false
|
|
eachDataNode(topoInfo, func(dc DataCenterId, rack RackId, dn *master_pb.DataNodeInfo) {
|
|
if found {
|
|
return
|
|
}
|
|
for _, diskInfo := range dn.DiskInfos {
|
|
for _, v := range diskInfo.VolumeInfos {
|
|
if needle.VolumeId(v.Id) == vid && v.RemoteStorageName != "" {
|
|
if !matchesCollection(v.Collection) {
|
|
continue
|
|
}
|
|
result = remoteVolumeInfo{
|
|
vid: vid,
|
|
collection: v.Collection,
|
|
remoteStorageName: v.RemoteStorageName,
|
|
serverAddress: pb.NewServerAddressWithGrpcPort(dn.Id, int(dn.GrpcPort)),
|
|
serverUrl: dn.Id,
|
|
}
|
|
found = true
|
|
return
|
|
}
|
|
}
|
|
}
|
|
})
|
|
return result, found, nil
|
|
}
|
|
|
|
func collectRemoteVolumesWithInfo(topoInfo *master_pb.TopologyInfo, collectionPattern string) ([]remoteVolumeInfo, error) {
|
|
collectionMatcher, err := compileCollectionPattern(collectionPattern)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("invalid collection pattern '%s': %v", collectionPattern, err)
|
|
}
|
|
|
|
seen := make(map[uint32]bool)
|
|
var result []remoteVolumeInfo
|
|
eachDataNode(topoInfo, func(dc DataCenterId, rack RackId, dn *master_pb.DataNodeInfo) {
|
|
for _, diskInfo := range dn.DiskInfos {
|
|
for _, v := range diskInfo.VolumeInfos {
|
|
if v.RemoteStorageName == "" {
|
|
continue
|
|
}
|
|
if !collectionMatcher.Matches(v.Collection) {
|
|
continue
|
|
}
|
|
if seen[v.Id] {
|
|
continue
|
|
}
|
|
seen[v.Id] = true
|
|
result = append(result, remoteVolumeInfo{
|
|
vid: needle.VolumeId(v.Id),
|
|
collection: v.Collection,
|
|
remoteStorageName: v.RemoteStorageName,
|
|
serverAddress: pb.NewServerAddressWithGrpcPort(dn.Id, int(dn.GrpcPort)),
|
|
serverUrl: dn.Id,
|
|
})
|
|
}
|
|
}
|
|
})
|
|
|
|
return result, nil
|
|
}
|
|
|
|
func doVolumeTierCompact(commandEnv *CommandEnv, writer io.Writer, rv remoteVolumeInfo, garbageThreshold float64, concurrency int) error {
|
|
grpcDialOption := commandEnv.option.GrpcDialOption
|
|
|
|
// step 1: check garbage level
|
|
garbageRatio, err := checkVolumeGarbage(grpcDialOption, rv.vid, rv.serverAddress)
|
|
if err != nil {
|
|
return fmt.Errorf("check garbage for volume %d: %v", rv.vid, err)
|
|
}
|
|
|
|
if garbageRatio < garbageThreshold {
|
|
fmt.Fprintf(writer, "volume %d garbage ratio %.4f below threshold %.4f, skipping\n",
|
|
rv.vid, garbageRatio, garbageThreshold)
|
|
return nil
|
|
}
|
|
|
|
fmt.Fprintf(writer, "volume %d garbage ratio %.4f, starting compaction...\n", rv.vid, garbageRatio)
|
|
|
|
// step 2: download .dat from remote to local
|
|
// this deletes the remote file and reloads the volume as local, then re-uploads below
|
|
fmt.Fprintf(writer, " downloading volume %d from %s to local...\n", rv.vid, rv.remoteStorageName)
|
|
err = downloadDatFromRemoteTier(grpcDialOption, writer, rv.vid, rv.collection, rv.serverAddress, false, concurrency)
|
|
if err != nil {
|
|
return fmt.Errorf("download volume %d from remote: %v", rv.vid, err)
|
|
}
|
|
|
|
// step 3: compact the local volume
|
|
fmt.Fprintf(writer, " compacting volume %d...\n", rv.vid)
|
|
err = compactVolumeOnServer(grpcDialOption, writer, rv.vid, rv.serverAddress)
|
|
if err != nil {
|
|
// compaction failed, but volume is now local without remote reference
|
|
// upload the uncompacted volume back to restore cloud tier state
|
|
fmt.Fprintf(writer, " compaction failed: %v\n", err)
|
|
fmt.Fprintf(writer, " re-uploading volume %d to %s without compaction...\n", rv.vid, rv.remoteStorageName)
|
|
uploadErr := uploadDatToRemoteTier(grpcDialOption, writer, rv.vid, rv.collection, rv.serverAddress, rv.remoteStorageName, false, concurrency)
|
|
if uploadErr != nil {
|
|
return fmt.Errorf("compaction failed (%v) and re-upload also failed (%v), volume %d remains local",
|
|
err, uploadErr, rv.vid)
|
|
}
|
|
return fmt.Errorf("compaction failed (%v), volume %d re-uploaded to %s without compaction",
|
|
err, rv.vid, rv.remoteStorageName)
|
|
}
|
|
|
|
// step 4: upload compacted volume back to remote
|
|
fmt.Fprintf(writer, " uploading compacted volume %d to %s...\n", rv.vid, rv.remoteStorageName)
|
|
err = uploadDatToRemoteTier(grpcDialOption, writer, rv.vid, rv.collection, rv.serverAddress, rv.remoteStorageName, false, concurrency)
|
|
if err != nil {
|
|
return fmt.Errorf("upload compacted volume %d to %s: %v (volume remains local with compacted data)",
|
|
rv.vid, rv.remoteStorageName, err)
|
|
}
|
|
|
|
fmt.Fprintf(writer, "volume %d compacted and uploaded to %s successfully\n", rv.vid, rv.remoteStorageName)
|
|
return nil
|
|
}
|
|
|
|
func checkVolumeGarbage(grpcDialOption grpc.DialOption, vid needle.VolumeId, server pb.ServerAddress) (float64, error) {
|
|
var garbageRatio float64
|
|
err := operation.WithVolumeServerClient(false, server, grpcDialOption, func(client volume_server_pb.VolumeServerClient) error {
|
|
resp, err := client.VacuumVolumeCheck(context.Background(), &volume_server_pb.VacuumVolumeCheckRequest{
|
|
VolumeId: uint32(vid),
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
garbageRatio = resp.GarbageRatio
|
|
return nil
|
|
})
|
|
return garbageRatio, err
|
|
}
|
|
|
|
func compactVolumeOnServer(grpcDialOption grpc.DialOption, writer io.Writer, vid needle.VolumeId, server pb.ServerAddress) error {
|
|
// compact
|
|
err := operation.WithVolumeServerClient(true, server, grpcDialOption, func(client volume_server_pb.VolumeServerClient) error {
|
|
stream, err := client.VacuumVolumeCompact(context.Background(), &volume_server_pb.VacuumVolumeCompactRequest{
|
|
VolumeId: uint32(vid),
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
for {
|
|
resp, recvErr := stream.Recv()
|
|
if recvErr != nil {
|
|
if recvErr == io.EOF {
|
|
break
|
|
}
|
|
return recvErr
|
|
}
|
|
fmt.Fprintf(writer, " compacted %d bytes\n", resp.ProcessedBytes)
|
|
}
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
if cleanupErr := vacuumVolumeCleanup(grpcDialOption, vid, server); cleanupErr != nil {
|
|
fmt.Fprintf(writer, " cleanup after compaction failure also failed: %v\n", cleanupErr)
|
|
}
|
|
return fmt.Errorf("compact: %v", err)
|
|
}
|
|
|
|
// commit
|
|
err = operation.WithVolumeServerClient(false, server, grpcDialOption, func(client volume_server_pb.VolumeServerClient) error {
|
|
_, err := client.VacuumVolumeCommit(context.Background(), &volume_server_pb.VacuumVolumeCommitRequest{
|
|
VolumeId: uint32(vid),
|
|
})
|
|
return err
|
|
})
|
|
if err != nil {
|
|
if cleanupErr := vacuumVolumeCleanup(grpcDialOption, vid, server); cleanupErr != nil {
|
|
fmt.Fprintf(writer, " cleanup after commit failure also failed: %v\n", cleanupErr)
|
|
}
|
|
return fmt.Errorf("commit: %v", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func vacuumVolumeCleanup(grpcDialOption grpc.DialOption, vid needle.VolumeId, server pb.ServerAddress) error {
|
|
return operation.WithVolumeServerClient(false, server, grpcDialOption, func(client volume_server_pb.VolumeServerClient) error {
|
|
_, err := client.VacuumVolumeCleanup(context.Background(), &volume_server_pb.VacuumVolumeCleanupRequest{
|
|
VolumeId: uint32(vid),
|
|
})
|
|
return err
|
|
})
|
|
}
|