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.
157 lines
5.4 KiB
Go
157 lines
5.4 KiB
Go
package ec_balance
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
"testing"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding/ecbalancer"
|
|
"github.com/seaweedfs/seaweedfs/weed/util/wildcard"
|
|
"github.com/seaweedfs/seaweedfs/weed/worker/types"
|
|
)
|
|
|
|
// The EC balance policy itself is tested in the shared ecbalancer package; these
|
|
// tests cover the worker adapter: building the planner topology from the master
|
|
// topology (filters, capacity) and the Detection entry point.
|
|
|
|
func ecTopo(node1Collection string) *master_pb.TopologyInfo {
|
|
node1 := &master_pb.DataNodeInfo{
|
|
Id: "node1",
|
|
DiskInfos: map[string]*master_pb.DiskInfo{
|
|
"": {Type: "", MaxVolumeCount: 100, EcShardInfos: []*master_pb.VolumeEcShardInformationMessage{
|
|
{Id: 100, Collection: node1Collection, DiskId: 0, EcIndexBits: 0x3FFF}, // 14 shards
|
|
}},
|
|
},
|
|
}
|
|
node2 := &master_pb.DataNodeInfo{
|
|
Id: "node2",
|
|
DiskInfos: map[string]*master_pb.DiskInfo{"": {Type: "", MaxVolumeCount: 100}},
|
|
}
|
|
return &master_pb.TopologyInfo{
|
|
DataCenterInfos: []*master_pb.DataCenterInfo{{
|
|
Id: "dc1",
|
|
RackInfos: []*master_pb.RackInfo{
|
|
{Id: "rack1", DataNodeInfos: []*master_pb.DataNodeInfo{node1}},
|
|
{Id: "rack2", DataNodeInfos: []*master_pb.DataNodeInfo{node2}},
|
|
},
|
|
}},
|
|
}
|
|
}
|
|
|
|
func TestBuildBalancerTopology(t *testing.T) {
|
|
config := NewDefaultConfig()
|
|
topo, nodeCount, _ := buildBalancerTopology(ecTopo("col1"), config, nil)
|
|
if nodeCount != 2 {
|
|
t.Fatalf("nodeCount = %d, want 2", nodeCount)
|
|
}
|
|
moves := ecbalancer.Plan(topo, ecbalancer.Options{ImbalanceThreshold: 0.01})
|
|
if len(moves) == 0 {
|
|
t.Error("expected cross-rack moves for an all-on-one-rack volume")
|
|
}
|
|
}
|
|
|
|
// TestBuildBalancerTopologyGroupsByHost: two volume servers on host 10.0.0.1
|
|
// (different ports) plus three other hosts, a 10+4 volume concentrated on the
|
|
// 10.0.0.1 machine. Four machines is enough to spread within parity, so after
|
|
// planning the 10.0.0.1 machine must hold <=4 shards of the volume -- which only
|
|
// holds if its two ports are grouped into one machine (host wired into the build).
|
|
func TestBuildBalancerTopologyGroupsByHost(t *testing.T) {
|
|
mkNode := func(id string, bits uint32) *master_pb.DataNodeInfo {
|
|
di := &master_pb.DiskInfo{Type: "", MaxVolumeCount: 100}
|
|
if bits != 0 {
|
|
di.EcShardInfos = []*master_pb.VolumeEcShardInformationMessage{{Id: 100, Collection: "col1", DiskId: 0, EcIndexBits: bits}}
|
|
}
|
|
return &master_pb.DataNodeInfo{Id: id, DiskInfos: map[string]*master_pb.DiskInfo{"": di}}
|
|
}
|
|
topoInfo := &master_pb.TopologyInfo{
|
|
DataCenterInfos: []*master_pb.DataCenterInfo{{
|
|
Id: "dc1",
|
|
RackInfos: []*master_pb.RackInfo{{Id: "rack1", DataNodeInfos: []*master_pb.DataNodeInfo{
|
|
mkNode("10.0.0.1:8080", 0x007F), // shards 0-6 on host 10.0.0.1
|
|
mkNode("10.0.0.1:8081", 0x3F80), // shards 7-13 on host 10.0.0.1
|
|
mkNode("10.0.0.2:8080", 0),
|
|
mkNode("10.0.0.3:8080", 0),
|
|
mkNode("10.0.0.4:8080", 0),
|
|
}}},
|
|
}},
|
|
}
|
|
|
|
topo, _, _ := buildBalancerTopology(topoInfo, NewDefaultConfig(), nil)
|
|
moves := ecbalancer.Plan(topo, ecbalancer.Options{ImbalanceThreshold: 0.01})
|
|
|
|
host := func(nodeID string) string { h, _, _ := net.SplitHostPort(nodeID); return h }
|
|
count := map[string]int{"10.0.0.1": 14}
|
|
for _, m := range moves {
|
|
if m.VolumeID != 100 {
|
|
continue
|
|
}
|
|
count[host(m.SourceNode)]--
|
|
if m.SourceNode != m.TargetNode { // non-dedup move
|
|
count[host(m.TargetNode)]++
|
|
}
|
|
}
|
|
if count["10.0.0.1"] > 4 {
|
|
t.Errorf("machine 10.0.0.1 holds %d shards of the volume after balancing, want <=4 (host grouping not applied)", count["10.0.0.1"])
|
|
}
|
|
}
|
|
|
|
func TestBuildBalancerTopologyCollectionFilter(t *testing.T) {
|
|
config := NewDefaultConfig()
|
|
config.CollectionFilter = "other" // does not match the volume's collection
|
|
allowed, err := wildcard.CompileCollectionMatcher(config.CollectionFilter)
|
|
if err != nil {
|
|
t.Fatalf("CompileCollectionMatcher: %v", err)
|
|
}
|
|
topo, nodeCount, _ := buildBalancerTopology(ecTopo("col1"), config, allowed)
|
|
if nodeCount != 2 {
|
|
t.Fatalf("nodeCount = %d, want 2", nodeCount)
|
|
}
|
|
if moves := ecbalancer.Plan(topo, ecbalancer.Options{ImbalanceThreshold: 0.01}); len(moves) != 0 {
|
|
t.Errorf("filtered-out collection should produce no moves, got %d", len(moves))
|
|
}
|
|
}
|
|
|
|
func TestDetectionDisabled(t *testing.T) {
|
|
config := NewDefaultConfig()
|
|
config.Enabled = false
|
|
|
|
results, hasMore, err := Detection(context.Background(), nil, nil, config, 0)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
if hasMore {
|
|
t.Error("expected hasMore=false")
|
|
}
|
|
if len(results) != 0 {
|
|
t.Errorf("expected 0 results, got %d", len(results))
|
|
}
|
|
}
|
|
|
|
func TestDetectionNilTopology(t *testing.T) {
|
|
config := NewDefaultConfig()
|
|
clusterInfo := &types.ClusterInfo{ActiveTopology: nil}
|
|
|
|
if _, _, err := Detection(context.Background(), nil, clusterInfo, config, 0); err == nil {
|
|
t.Fatal("expected error for nil topology")
|
|
}
|
|
}
|
|
|
|
func TestMovePhasePriority(t *testing.T) {
|
|
cases := map[string]types.TaskPriority{
|
|
"dedup": types.TaskPriorityHigh,
|
|
"cross_rack": types.TaskPriorityMedium,
|
|
"within_rack": types.TaskPriorityLow,
|
|
"global": types.TaskPriorityLow,
|
|
}
|
|
for phase, want := range cases {
|
|
if got := movePhasePriority(phase); got != want {
|
|
t.Errorf("movePhasePriority(%q) = %v, want %v", phase, got, want)
|
|
}
|
|
}
|
|
}
|
|
|
|
// keep the erasure_coding import meaningful for future adapter tests
|
|
var _ = erasure_coding.DataShardsCount
|