mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-09-08 15:41:15 +02:00
* worker: move the collection filter parser into weed/util/wildcard
The parser sits beside the volume-list filtering it was written for, in
weed/plugin/worker, which imports weed/shell — so the shell commands that
parse the same filter three other ways can never call it. Move it down to
weed/util/wildcard, next to the comma-separated wildcard helper it already
replaced, leaving the behavior unchanged.
* shell: parse every collection filter the same way
The shell parsed a collection filter three ways: compileCollectionPattern
compiled one regex for ec.encode, ec.decode, volume.balance and the tier
commands; volume.list and volume.deleteEmpty matched a single wildcard; and
volume.tier.move, volume.fix.replication and volume.configure.replication
called filepath.Match on their own. None of them took a list, so
"ec.encode -collection=a,b" selected nothing, the same way the admin UI did.
They all go through the shared matcher now: a comma-separated list of names,
"*" and "?" wildcards, "_default" for the collection with no name, and regex
entries. The one thing that stays per-command is what an empty value means -
every collection for -collectionPattern, the unnamed collection for the ec
and tier -collection flag - so compileCollectionPattern keeps that mapping.
The matchers are compiled once per command instead of once per volume, and a
regex entry now has to match the whole name unless it anchors itself, so
-collection=bucket no longer picks up mybucket2.
* shell: keep dots in collection names, and commas inside a regex
A dot no longer marks an entry as a regex, so a collection named "my.bucket"
matches itself and not "my-bucket" - the difference decides which volumes
volume.deleteEmpty and volume.tier.move touch. A dot still counts when it is
quantified, so "bucket.*" stays a prefix regex.
The comma split also leaves alone the commas inside a character class or a
repetition count, so "bucket[0-9]{1,3}" stays one entry instead of becoming
two broken fragments.
* shell: let a regex entry match its own spelling
A collection named after regex syntax, say "logs(2024)", was unreachable:
the entry compiled to a pattern that matches "logs2024" instead. Match the
entry verbatim as well, so naming a collection always selects it, whatever
characters it holds.
* shell: reject a collection filter that names no collection
A value of "," parsed to no entries and then matched every collection, so a
typo widened ec.encode or volume.deleteEmpty to the whole cluster. Only a
genuinely empty filter means "all collections"; anything else has to name one.
* shell: keep commas inside a regex group out of the entry split
The split already left alone the commas inside a character class or a
repetition count, but not the ones inside a group, so "bucket(foo,bar)"
was cut into two fragments that no longer compile.
* shell: cover escaping a collection name that is not a regex
A name like "logs(2024" does not parse as a regex on its own; escaping it,
"logs\(2024", reaches it. Pin that so the escape hatch does not regress.
* shell: split entries only on commas inside a closed regex construct
An unmatched "{" or "[" made the splitter swallow every comma after it, so
"foo{bar,videos" became one entry that matches neither collection - the
silent no-op this filter work exists to remove. A construct now has to close
before its commas stop separating entries.
* shell: skip character classes while scanning a regex group
A ")" inside a class is a literal, so "(a[)],b)" ended its group early and
split into two fragments that no longer compile.
* shell: cover escaping a comma inside a collection name
A comma separates entries, so a name holding one is reached by escaping it.
* shell: follow the regexp parser when scanning a character class
A "]" leading a class is a member of it, and a POSIX class such as
"[:alpha:]" carries its own "]", so stopping at the first one cut a valid
filter like "(a[]),],b)" into fragments and rejected it.
332 lines
12 KiB
Go
332 lines
12 KiB
Go
package ec_balance
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"time"
|
|
|
|
"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/pb/worker_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding/ecbalancer"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/super_block"
|
|
storagetypes "github.com/seaweedfs/seaweedfs/weed/storage/types"
|
|
"github.com/seaweedfs/seaweedfs/weed/topology/balancer"
|
|
"github.com/seaweedfs/seaweedfs/weed/util/wildcard"
|
|
"github.com/seaweedfs/seaweedfs/weed/worker/tasks/base"
|
|
"github.com/seaweedfs/seaweedfs/weed/worker/types"
|
|
)
|
|
|
|
// Detection builds an EC balance topology snapshot from the cluster's active
|
|
// topology, runs the shared ecbalancer planner, and converts the planned moves
|
|
// into worker task proposals. The balancing policy lives in
|
|
// weed/storage/erasure_coding/ecbalancer, shared with the shell ec.balance
|
|
// command so the two cannot drift.
|
|
func Detection(
|
|
ctx context.Context,
|
|
metrics []*types.VolumeHealthMetrics,
|
|
clusterInfo *types.ClusterInfo,
|
|
config base.TaskConfig,
|
|
maxResults int,
|
|
) ([]*types.TaskDetectionResult, bool, error) {
|
|
if !config.IsEnabled() {
|
|
return nil, false, nil
|
|
}
|
|
|
|
ecConfig := config.(*Config)
|
|
if maxResults < 0 {
|
|
maxResults = 0
|
|
}
|
|
|
|
if clusterInfo == nil || clusterInfo.ActiveTopology == nil {
|
|
return nil, false, fmt.Errorf("active topology not available for EC balance detection")
|
|
}
|
|
topoInfo := clusterInfo.ActiveTopology.GetTopologyInfo()
|
|
if topoInfo == nil {
|
|
return nil, false, fmt.Errorf("topology info not available")
|
|
}
|
|
|
|
allowedCollections, err := wildcard.CompileCollectionMatcher(ecConfig.CollectionFilter)
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
|
|
topo, nodeCount, volumeRatio := buildBalancerTopology(topoInfo, ecConfig, allowedCollections)
|
|
if nodeCount < ecConfig.MinServerCount {
|
|
glog.V(1).Infof("EC balance: only %d servers, need at least %d", nodeCount, ecConfig.MinServerCount)
|
|
return nil, false, nil
|
|
}
|
|
|
|
replicaPlacement := resolveReplicaPlacement(ecConfig, clusterInfo)
|
|
|
|
if ctx != nil {
|
|
if err := ctx.Err(); err != nil {
|
|
return nil, false, err
|
|
}
|
|
}
|
|
|
|
// Canonical disk type for placement/execution: "hdd" -> "" (HardDriveType),
|
|
// matching the topology's disk keys and the volume server's move RPCs.
|
|
normalizedDiskType := storagetypes.ToDiskType(ecConfig.DiskType).String()
|
|
|
|
moves := ecbalancer.Plan(topo, ecbalancer.Options{
|
|
DiskType: normalizedDiskType,
|
|
ImbalanceThreshold: ecConfig.ImbalanceThreshold,
|
|
ReplicaPlacement: replicaPlacement,
|
|
Ratio: func(collection string) (int, int) {
|
|
return resolveECRatio(clusterInfo, collection)
|
|
},
|
|
// Prefer each volume's own heartbeat-reported ratio over the collection
|
|
// default so a mixed-ratio collection is spread per volume; 0 defers to
|
|
// resolveECRatio (and is the always-0 OSS case).
|
|
VolumeRatio: volumeRatio,
|
|
// Move incrementally across detection cycles rather than draining a rack
|
|
// in one batch; the scheduler re-evaluates each cycle.
|
|
GlobalMaxMovesPerRack: 10,
|
|
// Balance heterogeneous-capacity racks by fractional fullness.
|
|
GlobalUtilizationBased: true,
|
|
})
|
|
if len(moves) == 0 {
|
|
return nil, false, nil
|
|
}
|
|
|
|
hasMore := false
|
|
if maxResults > 0 && len(moves) > maxResults {
|
|
moves = moves[:maxResults]
|
|
hasMore = true
|
|
}
|
|
|
|
now := time.Now()
|
|
results := make([]*types.TaskDetectionResult, 0, len(moves))
|
|
for i, m := range moves {
|
|
taskID := fmt.Sprintf("ec_balance_%d_%d_%s_%s_%d_%d",
|
|
m.VolumeID, m.ShardID, m.SourceNode, m.TargetNode, now.UnixNano(), i)
|
|
results = append(results, &types.TaskDetectionResult{
|
|
TaskID: taskID,
|
|
TaskType: types.TaskTypeECBalance,
|
|
VolumeID: m.VolumeID,
|
|
Server: m.SourceNode,
|
|
Collection: m.Collection,
|
|
Priority: movePhasePriority(m.Phase),
|
|
Reason: fmt.Sprintf("EC shard %d.%d %s: %s → %s",
|
|
m.VolumeID, m.ShardID, m.Phase, m.SourceNode, m.TargetNode),
|
|
ScheduleAt: now,
|
|
TypedParams: &worker_pb.TaskParams{
|
|
TaskId: taskID,
|
|
VolumeId: m.VolumeID,
|
|
Collection: m.Collection,
|
|
Sources: []*worker_pb.TaskSource{{
|
|
Node: m.SourceNode,
|
|
DiskId: m.SourceDisk,
|
|
Rack: m.SourceRack,
|
|
ShardIds: []uint32{uint32(m.ShardID)},
|
|
}},
|
|
Targets: []*worker_pb.TaskTarget{{
|
|
Node: m.TargetNode,
|
|
DiskId: m.TargetDisk,
|
|
Rack: m.TargetRack,
|
|
ShardIds: []uint32{uint32(m.ShardID)},
|
|
}},
|
|
TaskParams: &worker_pb.TaskParams_EcBalanceParams{
|
|
EcBalanceParams: &worker_pb.EcBalanceTaskParams{
|
|
DiskType: normalizedDiskType,
|
|
DedupKeepNode: m.KeepNode,
|
|
TimeoutSeconds: 600,
|
|
IoBytePerSecond: ecConfig.IoBytePerSecond,
|
|
},
|
|
},
|
|
},
|
|
})
|
|
}
|
|
|
|
glog.V(1).Infof("EC balance detection: %d moves proposed", len(results))
|
|
return results, hasMore, nil
|
|
}
|
|
|
|
// buildBalancerTopology builds an ecbalancer.Topology from the master topology,
|
|
// applying the data-center, disk-type, and collection filters. Rack keys are
|
|
// dc:rack composites to avoid cross-DC name collisions. Per-disk free capacity
|
|
// is split evenly from the node total because the wire collapses same-type disks.
|
|
// Returns the topology, the number of eligible nodes (for MinServerCount), and a
|
|
// per-volume ratio lookup built from each shard's heartbeat (0,0 when unreported,
|
|
// e.g. always in OSS) which Plan prefers over the collection ratio for mixed-ratio
|
|
// clusters.
|
|
func buildBalancerTopology(topoInfo *master_pb.TopologyInfo, config *Config, allowedCollections *wildcard.CollectionMatcher) (*ecbalancer.Topology, int, func(collection string, vid uint32) (int, int)) {
|
|
topo := ecbalancer.NewTopology()
|
|
|
|
type volRatioKey struct {
|
|
collection string
|
|
vid uint32
|
|
}
|
|
volRatios := make(map[volRatioKey][2]int)
|
|
|
|
// Normalize the disk-type filter: "hdd" (and the default "") map to the
|
|
// HardDriveType, which the topology reports under the empty-string key. Keep a
|
|
// separate "filter requested" flag so a configured "hdd" still filters to HDD
|
|
// disks instead of being mistaken for "all disk types".
|
|
filterByDiskType := config.DiskType != ""
|
|
wantDiskType := storagetypes.ToDiskType(config.DiskType).String()
|
|
|
|
nodeCount := 0
|
|
for _, dc := range topoInfo.DataCenterInfos {
|
|
if config.DataCenterFilter != "" {
|
|
matchers := wildcard.CompileWildcardMatchers(config.DataCenterFilter)
|
|
if !wildcard.MatchesAnyWildcard(matchers, dc.Id) {
|
|
continue
|
|
}
|
|
}
|
|
|
|
for _, rack := range dc.RackInfos {
|
|
rackKey := dc.Id + ":" + rack.Id
|
|
|
|
for _, dn := range rack.DataNodeInfos {
|
|
freeSlots := 0
|
|
diskTypeOf := make(map[uint32]string) // physical disk_id -> disk type
|
|
diskShardCount := make(map[uint32]int)
|
|
fullDiskTypes := make(map[string]bool) // physically near-full, ineligible as a target
|
|
hasMatchingDisk := false
|
|
|
|
for diskType, diskInfo := range dn.DiskInfos {
|
|
if filterByDiskType && diskType != wantDiskType {
|
|
continue
|
|
}
|
|
hasMatchingDisk = true
|
|
|
|
// Don't place EC shards on a physically near-full disk, even if slot
|
|
// math says it has room (an over-set maxVolumeCount hides real
|
|
// fullness). Statfs free bytes already include EC shard files.
|
|
if balancer.DiskTooFullAfter(diskInfo.DiskTotalBytes, diskInfo.DiskFreeBytes, 0, balancer.DefaultMaxDiskUsagePercent) {
|
|
fullDiskTypes[diskType] = true
|
|
}
|
|
|
|
fs := int(diskInfo.MaxVolumeCount-diskInfo.VolumeCount)*erasure_coding.DataShardsCount - countEcShards(diskInfo.EcShardInfos)
|
|
if fs > 0 && !fullDiskTypes[diskType] {
|
|
freeSlots += fs
|
|
}
|
|
// Discover physical disks from regular volumes too, so an
|
|
// EC-empty disk is still a candidate destination.
|
|
for _, vi := range diskInfo.VolumeInfos {
|
|
if _, ok := diskTypeOf[vi.DiskId]; !ok {
|
|
diskTypeOf[vi.DiskId] = diskType
|
|
}
|
|
}
|
|
for _, eci := range diskInfo.EcShardInfos {
|
|
if _, ok := diskTypeOf[eci.DiskId]; !ok {
|
|
diskTypeOf[eci.DiskId] = diskType
|
|
}
|
|
// Disk occupancy counts ALL volumes' shards (capacity model),
|
|
// independent of the collection filter below.
|
|
diskShardCount[eci.DiskId] += erasure_coding.GetShardCount(eci)
|
|
}
|
|
}
|
|
|
|
if !hasMatchingDisk {
|
|
continue
|
|
}
|
|
|
|
node := topo.AddNode(dn.Id, dc.Id, rackKey, freeSlots)
|
|
// Group servers sharing a host so a volume's shards spread across
|
|
// machines, not just nodes (servers on one host are one fault domain).
|
|
node.SetHost(pb.NewServerAddressFromDataNode(dn).ToHost())
|
|
|
|
// Spread the node's free slots only over its non-full disks, so a
|
|
// physically full disk type doesn't dilute the share the usable disks
|
|
// advertise (its own disks get 0 below). The total is preserved.
|
|
nonFullDiskCount := 0
|
|
for _, dt := range diskTypeOf {
|
|
if !fullDiskTypes[dt] {
|
|
nonFullDiskCount++
|
|
}
|
|
}
|
|
perDiskFree := 0
|
|
if nonFullDiskCount > 0 && freeSlots > 0 {
|
|
perDiskFree = freeSlots / nonFullDiskCount
|
|
}
|
|
for diskID, diskType := range diskTypeOf {
|
|
diskFree := perDiskFree
|
|
if fullDiskTypes[diskType] {
|
|
diskFree = 0
|
|
}
|
|
node.AddDisk(diskID, diskType, diskFree, diskShardCount[diskID])
|
|
}
|
|
|
|
// Add shards only for volumes whose collection passes the filter;
|
|
// those are the volumes the planner will balance.
|
|
for diskType, diskInfo := range dn.DiskInfos {
|
|
if filterByDiskType && diskType != wantDiskType {
|
|
continue
|
|
}
|
|
for _, eci := range diskInfo.EcShardInfos {
|
|
if !allowedCollections.Matches(eci.Collection) {
|
|
continue
|
|
}
|
|
node.AddShards(eci.Id, eci.Collection, eci.DiskId, erasure_coding.ShardBits(eci.EcIndexBits))
|
|
if d, p := ecbalancer.VolumeShardRatio(eci); d > 0 || p > 0 {
|
|
volRatios[volRatioKey{eci.Collection, eci.Id}] = [2]int{d, p}
|
|
}
|
|
}
|
|
}
|
|
|
|
nodeCount++
|
|
}
|
|
}
|
|
}
|
|
|
|
volumeRatio := func(collection string, vid uint32) (int, int) {
|
|
r := volRatios[volRatioKey{collection, vid}]
|
|
return r[0], r[1]
|
|
}
|
|
return topo, nodeCount, volumeRatio
|
|
}
|
|
|
|
// resolveECRatio returns the (dataShards, parityShards) for a collection from the
|
|
// admin EC config snapshot when present, else the local default. This keeps the
|
|
// enterprise-only custom-ratio plumbing out of the shared planner.
|
|
func resolveECRatio(_ *types.ClusterInfo, _ string) (int, int) {
|
|
// Custom EC ratios are an enterprise feature; OSS uses the standard scheme.
|
|
return normalizeECShardCounts(0, 0)
|
|
}
|
|
|
|
// resolveReplicaPlacement picks the EC shard replica placement constraint: an
|
|
// explicit config value wins; otherwise it falls back to the master's default
|
|
// replication (matching the shell ec.balance default). A missing, invalid, or
|
|
// zero-replication value yields nil, meaning even spread / no constraint.
|
|
func resolveReplicaPlacement(ecConfig *Config, clusterInfo *types.ClusterInfo) *super_block.ReplicaPlacement {
|
|
clusterDefault := ""
|
|
if clusterInfo != nil {
|
|
clusterDefault = clusterInfo.DefaultReplicaPlacement
|
|
}
|
|
return super_block.ResolveReplicaPlacement(ecConfig.ReplicaPlacement, clusterDefault)
|
|
}
|
|
|
|
func normalizeECShardCounts(dataShards, parityShards int) (int, int) {
|
|
if dataShards <= 0 {
|
|
dataShards = erasure_coding.DataShardsCount
|
|
}
|
|
if parityShards <= 0 {
|
|
parityShards = erasure_coding.ParityShardsCount
|
|
}
|
|
return dataShards, parityShards
|
|
}
|
|
|
|
func countEcShards(ecShardInfos []*master_pb.VolumeEcShardInformationMessage) int {
|
|
count := 0
|
|
for _, eci := range ecShardInfos {
|
|
count += erasure_coding.GetShardCount(eci)
|
|
}
|
|
return count
|
|
}
|
|
|
|
func movePhasePriority(phase string) types.TaskPriority {
|
|
switch phase {
|
|
case "dedup":
|
|
return types.TaskPriorityHigh
|
|
case "cross_rack":
|
|
return types.TaskPriorityMedium
|
|
default:
|
|
return types.TaskPriorityLow
|
|
}
|
|
}
|