mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-18 20:18:27 +02:00
* shell: make every -collection flag parse the same way The filter vocabulary (comma-separated names, wildcards, regexes, "_default" for the empty-named collection) already existed in wildcard.CompileCollectionMatcher, but several commands still did their own exact-match comparison or sent the raw flag value to servers. fs.mergeVolumes used a literal string compare, so -collection=_default silently produced an empty merge plan; it now uses the shared matcher while keeping "*" as the match-all default. volume.fsck and volume.mark filter through the matcher too, and volume.vacuum resolves the filter client-side into per-collection and per-volume requests, since no Collection value scopes the VacuumVolume RPC to the unnamed collection alone. Commands that put one concrete collection name on the wire normalize "_default" to "" (volume.grow, fs.configure, mq.topic.compact, collection.delete, ec.rebuild, ec.balance), and the tier -volumeId commands resolve the volume's actual collection from topology first so patterns and named-collection requests pass the volume server's collection check. * shell: spell the default-collection keyword via CollectionDefault * shell: address review findings on collection filter handling volume.fsck keeps a set of every volume the master knows before any filtering, so a filer entry whose volume was excluded by -collection or -volumeId is skipped instead of reported "volume not found" and deleted by -reallyDeleteFilerEntries. The collection filter also no longer scopes the filer walk to /buckets/<collection>: fs.configure can bind a collection to any path prefix, and a narrower walk could mark live chunks as orphans under -reallyDeleteFromVolume. ec.rebuild and ec.balance resolve -collection through the new wildcard.ExpandCollectionFilter, which passes literal names through even when the master does not list them — ec.rebuild must be able to recover a collection whose shards all lost their index and never registered. fs.configure and mq.topic.compact now reject _default outright: an empty Collection means "unset" in both the path-rule merge and the filer's storage-option fallback chain, so the keyword would have been silently ignored. The unnamed-collection vacuum sweep keeps the master's low-disk-space exception: a volume whose every replica is read-only is probed with VacuumVolumeCheck and stays eligible when a replica reports DiskSpaceLow, instead of being dropped outright.
180 lines
6.9 KiB
Go
180 lines
6.9 KiB
Go
package shell
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/ec"
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/needle"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/super_block"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/types"
|
|
"github.com/seaweedfs/seaweedfs/weed/util/wildcard"
|
|
"github.com/seaweedfs/seaweedfs/weed/wdclient"
|
|
)
|
|
|
|
// The EC orchestration logic lives in weed/ec so the shell commands and the
|
|
// maintenance workers share it. The aliases below keep the shell-internal
|
|
// names working for the command files that still use them.
|
|
type DataCenterId = ec.DataCenterId
|
|
type RackId = ec.RackId
|
|
type EcNode = ec.EcNode
|
|
|
|
var (
|
|
ecBalanceAlgorithmDescription = ec.BalanceAlgorithmDescription
|
|
eachDataNode = ec.EachDataNode
|
|
collectEcVolumeServersByDc = ec.CollectEcVolumeServersByDc
|
|
pickBestDiskOnNode = ec.PickBestDiskOnNode
|
|
collectVolumeIdToCollection = ec.CollectVolumeIdToCollection
|
|
parseVolumeIdsFlag = ec.ParseVolumeIdsFlag
|
|
chunkVolumeIds = ec.ChunkVolumeIds
|
|
)
|
|
|
|
// ecEnv adapts a CommandEnv to the cluster access hooks the ec package needs.
|
|
func (ce *CommandEnv) ecEnv() *ec.Env {
|
|
return &ec.Env{
|
|
GrpcDialOption: ce.option.GrpcDialOption,
|
|
FetchTopology: func(delay time.Duration) (*master_pb.TopologyInfo, uint64, error) {
|
|
return collectTopologyInfo(ce, delay)
|
|
},
|
|
GetVolumeLocations: func(vid uint32) ([]wdclient.Location, bool) {
|
|
return ce.MasterClient.GetLocationsClone(vid)
|
|
},
|
|
IsLocked: ce.isLocked,
|
|
}
|
|
}
|
|
|
|
// Overridable functions for testing.
|
|
var getDefaultReplicaPlacement = _getDefaultReplicaPlacement
|
|
|
|
func _getDefaultReplicaPlacement(commandEnv *CommandEnv) (*super_block.ReplicaPlacement, error) {
|
|
var resp *master_pb.GetMasterConfigurationResponse
|
|
var err error
|
|
|
|
err = commandEnv.MasterClient.WithClient(context.Background(), false, func(client master_pb.SeaweedClient) error {
|
|
resp, err = client.GetMasterConfiguration(context.Background(), &master_pb.GetMasterConfigurationRequest{})
|
|
return err
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return super_block.NewReplicaPlacementFromString(resp.DefaultReplication)
|
|
}
|
|
|
|
func parseReplicaPlacementArg(commandEnv *CommandEnv, replicaStr string) (*super_block.ReplicaPlacement, error) {
|
|
var rp *super_block.ReplicaPlacement
|
|
var err error
|
|
|
|
if replicaStr != "" {
|
|
rp, err = super_block.NewReplicaPlacementFromString(replicaStr)
|
|
if err != nil {
|
|
return rp, err
|
|
}
|
|
glog.V(1).Infof("using replica placement %q for EC volumes\n", rp.String())
|
|
} else {
|
|
// No replica placement argument provided, resolve from master default settings.
|
|
rp, err = getDefaultReplicaPlacement(commandEnv)
|
|
if err != nil {
|
|
return rp, err
|
|
}
|
|
glog.V(1).Infof("using master default replica placement %q for EC volumes\n", rp.String())
|
|
}
|
|
|
|
return rp, nil
|
|
}
|
|
|
|
func collectTopologyInfo(commandEnv *CommandEnv, delayBeforeCollecting time.Duration) (topoInfo *master_pb.TopologyInfo, volumeSizeLimitMb uint64, err error) {
|
|
if delayBeforeCollecting > 0 {
|
|
time.Sleep(delayBeforeCollecting)
|
|
}
|
|
|
|
var resp *master_pb.VolumeListResponse
|
|
err = commandEnv.MasterClient.WithClient(context.Background(), false, func(client master_pb.SeaweedClient) error {
|
|
resp, err = pb.CollectVolumeList(context.Background(), client, &master_pb.VolumeListRequest{})
|
|
return err
|
|
})
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
return resp.TopologyInfo, resp.VolumeSizeLimitMb, nil
|
|
}
|
|
|
|
func collectDataNodes(commandEnv *CommandEnv, delayBeforeCollecting time.Duration) ([]*master_pb.DataNodeInfo, error) {
|
|
dataNodes := []*master_pb.DataNodeInfo{}
|
|
|
|
topo, _, err := collectTopologyInfo(commandEnv, delayBeforeCollecting)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
for _, dci := range topo.GetDataCenterInfos() {
|
|
for _, r := range dci.GetRackInfos() {
|
|
for _, dn := range r.GetDataNodeInfos() {
|
|
dataNodes = append(dataNodes, dn)
|
|
}
|
|
}
|
|
}
|
|
|
|
return dataNodes, nil
|
|
}
|
|
|
|
func collectEcNodesForDC(commandEnv *CommandEnv, selectedDataCenter string, diskType types.DiskType) (ecNodes []*EcNode, totalFreeEcSlots int, err error) {
|
|
return ec.CollectEcNodesForDC(commandEnv.ecEnv(), selectedDataCenter, diskType)
|
|
}
|
|
|
|
func collectEcNodes(commandEnv *CommandEnv, diskType types.DiskType) (ecNodes []*EcNode, totalFreeEcSlots int, err error) {
|
|
return ec.CollectEcNodes(commandEnv.ecEnv(), diskType)
|
|
}
|
|
|
|
func moveMountedShardToEcNode(commandEnv *CommandEnv, existingLocation *EcNode, collection string, vid needle.VolumeId, shardId erasure_coding.ShardId, destinationEcNode *EcNode, destDiskId uint32, applyBalancing bool, diskType types.DiskType) (err error) {
|
|
return ec.MoveMountedShardToEcNode(commandEnv.ecEnv(), existingLocation, collection, vid, shardId, destinationEcNode, destDiskId, applyBalancing, diskType)
|
|
}
|
|
|
|
// EcBalance balances EC shards across the cluster; see ec.EcBalance for the
|
|
// excludeNodes and volumeIds semantics.
|
|
func EcBalance(commandEnv *CommandEnv, collections []string, dc string, ecReplicaPlacement *super_block.ReplicaPlacement, diskType types.DiskType, maxParallelization int, ioBytePerSecond int64, applyBalancing bool, excludeNodes map[pb.ServerAddress]struct{}, volumeIds []needle.VolumeId) (err error) {
|
|
return ec.EcBalance(commandEnv.ecEnv(), collections, dc, ecReplicaPlacement, diskType, maxParallelization, ioBytePerSecond, applyBalancing, excludeNodes, volumeIds, nil)
|
|
}
|
|
|
|
// compileCollectionPattern compiles the -collection value shared by commands
|
|
// where an empty value means the collection with no name: a comma-separated
|
|
// list of collection names, wildcards, and regex patterns, or CollectionDefault
|
|
// for the empty-named collection.
|
|
func compileCollectionPattern(pattern string) (*wildcard.CollectionMatcher, error) {
|
|
if strings.TrimSpace(pattern) == "" {
|
|
pattern = CollectionDefault
|
|
}
|
|
return wildcard.CompileCollectionMatcher(pattern)
|
|
}
|
|
|
|
// resolveEcCollections expands the ec commands' -collection value into
|
|
// collection names. An empty value means the empty-named collection, the same
|
|
// as CollectionDefault. Literal names pass through even when the master does
|
|
// not list them — the listing only contains collections with registered
|
|
// volumes, and ec.rebuild exists to bring back a collection whose volumes all
|
|
// lost their index. Wildcard and regex entries resolve against the listing.
|
|
func resolveEcCollections(commandEnv *CommandEnv, filter string) (collections []string, err error) {
|
|
if strings.TrimSpace(filter) == "" {
|
|
filter = CollectionDefault
|
|
}
|
|
names, err := ListCollectionNames(commandEnv, false, true)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
collections, err = wildcard.ExpandCollectionFilter(filter, names)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("invalid collection pattern %q: %w", filter, err)
|
|
}
|
|
if len(collections) == 0 {
|
|
return nil, fmt.Errorf("no collections match %q", filter)
|
|
}
|
|
return collections, nil
|
|
}
|