mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-08-28 03:46:24 +00: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.
145 lines
4.4 KiB
Go
145 lines
4.4 KiB
Go
package shell
|
|
|
|
import (
|
|
"io"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/super_block"
|
|
)
|
|
|
|
func testFixLocation(dc, rack, id string, maxVolumes int64) location {
|
|
return location{
|
|
dc: dc,
|
|
rack: rack,
|
|
dataNode: &master_pb.DataNodeInfo{
|
|
Id: id,
|
|
DiskInfos: map[string]*master_pb.DiskInfo{
|
|
"": {MaxVolumeCount: maxVolumes, FreeVolumeCount: maxVolumes},
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
func TestReserveTargetSpreadsAcrossServers(t *testing.T) {
|
|
src := testFixLocation("dc1", "r1", "dn0", 0)
|
|
allLocations := []location{
|
|
src,
|
|
testFixLocation("dc1", "r1", "dn1", 10),
|
|
testFixLocation("dc1", "r1", "dn2", 5),
|
|
testFixLocation("dc1", "r1", "dn3", 3),
|
|
}
|
|
// keepDataNodesSorted reorders allLocations in place, so keep stable
|
|
// per-node copies; the shared dataNode pointers carry the accounting
|
|
byId := make(map[string]*location)
|
|
for _, loc := range allLocations {
|
|
loc := loc
|
|
byId[loc.dataNode.Id] = &loc
|
|
}
|
|
replicas := []*VolumeReplica{
|
|
{location: &src, info: &master_pb.VolumeInformationMessage{Id: 1}},
|
|
}
|
|
rp, _ := super_block.NewReplicaPlacementFromString("001")
|
|
|
|
// with all copies in flight, consecutive reservations must not converge on
|
|
// the emptiest server
|
|
s := newVolumeCopyScheduler(1)
|
|
var reserved []*location
|
|
got := make(map[string]bool)
|
|
for i := 0; i < 3; i++ {
|
|
dst := s.reserveTarget(rp, replicas, allLocations, "", true)
|
|
if dst == nil {
|
|
t.Fatalf("reservation %d found no destination", i)
|
|
}
|
|
reserved = append(reserved, dst)
|
|
got[dst.dataNode.Id] = true
|
|
}
|
|
for _, id := range []string{"dn1", "dn2", "dn3"} {
|
|
if !got[id] {
|
|
t.Errorf("expected a reservation on %s, got %v", id, got)
|
|
}
|
|
}
|
|
|
|
// every eligible destination is at the copy cap: the next reservation
|
|
// waits for a free slot instead of failing
|
|
done := make(chan *location)
|
|
go func() {
|
|
done <- s.reserveTarget(rp, replicas, allLocations, "", true)
|
|
}()
|
|
select {
|
|
case dst := <-done:
|
|
t.Fatalf("reserveTarget should wait while all destinations are at the copy cap, got %s", dst.dataNode.Id)
|
|
case <-time.After(100 * time.Millisecond):
|
|
}
|
|
s.releaseTarget(byId["dn1"], "", true)
|
|
var waited *location
|
|
select {
|
|
case waited = <-done:
|
|
case <-time.After(5 * time.Second):
|
|
t.Fatal("reserveTarget did not wake up after a copy slot freed")
|
|
}
|
|
if waited == nil || waited.dataNode.Id != "dn1" {
|
|
t.Fatalf("expected the freed dn1 to take the waiting copy, got %+v", waited)
|
|
}
|
|
|
|
// a successful copy keeps its volume slot, a failed one returns it
|
|
s.releaseTarget(waited, "", true)
|
|
if count := byId["dn1"].dataNode.DiskInfos[""].VolumeCount; count != 2 {
|
|
t.Errorf("dn1 should keep 2 reserved slots, got %d", count)
|
|
}
|
|
for _, dst := range reserved {
|
|
if dst.dataNode.Id != "dn1" {
|
|
s.releaseTarget(dst, "", false)
|
|
if count := dst.dataNode.DiskInfos[""].VolumeCount; count != 0 {
|
|
t.Errorf("%s should have its failed reservation returned, got volume count %d", dst.dataNode.Id, count)
|
|
}
|
|
}
|
|
}
|
|
if len(s.inflight) != 0 {
|
|
t.Errorf("all copies released, but %d still in flight", len(s.inflight))
|
|
}
|
|
}
|
|
|
|
func TestFixUnderReplicatedVolumesInParallel(t *testing.T) {
|
|
src := testFixLocation("dc1", "r1", "dn0", 0)
|
|
allLocations := []location{
|
|
src,
|
|
testFixLocation("dc1", "r1", "dn1", 4),
|
|
testFixLocation("dc1", "r1", "dn2", 4),
|
|
testFixLocation("dc1", "r1", "dn3", 4),
|
|
}
|
|
rp, _ := super_block.NewReplicaPlacementFromString("001")
|
|
|
|
volumeReplicas := make(map[uint32][]*VolumeReplica)
|
|
var volumeIds []uint32
|
|
for vid := uint32(1); vid <= 12; vid++ {
|
|
volumeReplicas[vid] = []*VolumeReplica{
|
|
{location: &src, info: &master_pb.VolumeInformationMessage{Id: vid, ReplicaPlacement: uint32(rp.Byte())}},
|
|
}
|
|
volumeIds = append(volumeIds, vid)
|
|
}
|
|
|
|
c := &commandVolumeFixReplication{}
|
|
fixedVolumes, err := c.fixUnderReplicatedVolumes(nil, io.Discard, false, volumeIds, volumeReplicas, allLocations, 0, 0, 8, 1)
|
|
if err != nil {
|
|
t.Fatalf("fixUnderReplicatedVolumes: %v", err)
|
|
}
|
|
if len(fixedVolumes) != 0 {
|
|
t.Errorf("simulation should not record fixed volumes, got %d", len(fixedVolumes))
|
|
}
|
|
|
|
// 12 volumes must exactly fill the 3x4 free slots without over-reserving
|
|
// any single destination
|
|
for _, loc := range allLocations {
|
|
if loc.dataNode.Id == "dn0" {
|
|
continue
|
|
}
|
|
diskInfo := loc.dataNode.DiskInfos[""]
|
|
if diskInfo.VolumeCount != 4 || diskInfo.FreeVolumeCount != 0 {
|
|
t.Errorf("%s expected exactly 4 reserved slots, got volume count %d, free %d",
|
|
loc.dataNode.Id, diskInfo.VolumeCount, diskInfo.FreeVolumeCount)
|
|
}
|
|
}
|
|
}
|