mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-18 03:58:32 +02:00
shell: make every -collection flag parse the same way (#11794)
* 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.
This commit is contained in:
1 parent
268424a5e1
commit
b0ab4c4e1e
23 files changed
+593
-71
No files matched your search
@@ -9,6 +9,7 @@ import (
|
||||
|
||||
"github.com/seaweedfs/seaweedfs/weed/pb"
|
||||
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
|
||||
"github.com/seaweedfs/seaweedfs/weed/util/wildcard"
|
||||
|
||||
"github.com/seaweedfs/seaweedfs/weed/storage/needle"
|
||||
)
|
||||
@@ -47,7 +48,7 @@ func (c *commandVolumeMark) Do(args []string, commandEnv *CommandEnv, writer io.
|
||||
volMarkCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
|
||||
volumeIdInt := volMarkCommand.Int("volumeId", 0, "the volume id")
|
||||
nodeStr := volMarkCommand.String("node", "", "the volume server <host>:<port>")
|
||||
collection := volMarkCommand.String("collection", "", "the collection name")
|
||||
collection := volMarkCommand.String("collection", "", "comma-separated collection names, wildcards, or regex patterns; \""+CollectionDefault+"\" for the collection with no name")
|
||||
writable := volMarkCommand.Bool("writable", false, "volume mark writable")
|
||||
readonly := volMarkCommand.Bool("readonly", false, "volume mark readonly")
|
||||
readonlyCanDelete := volMarkCommand.Bool("readonlyCanDelete", false, "volume mark readonly but still accepting deletes")
|
||||
@@ -137,11 +138,9 @@ func collectVolumeMarkTargetsByCollection(topoInfo *master_pb.TopologyInfo, coll
|
||||
if collection == "" {
|
||||
return nil, fmt.Errorf("collection is required")
|
||||
}
|
||||
|
||||
// _default targets volumes that belong to no named collection.
|
||||
matchCollection := collection
|
||||
if matchCollection == CollectionDefault {
|
||||
matchCollection = ""
|
||||
collectionMatcher, err := wildcard.CompileCollectionMatcher(collection)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("invalid collection pattern %q: %w", collection, err)
|
||||
}
|
||||
|
||||
var targets []volumeMarkTarget
|
||||
@@ -152,7 +151,7 @@ func collectVolumeMarkTargetsByCollection(topoInfo *master_pb.TopologyInfo, coll
|
||||
sourceVolumeServer := pb.NewServerAddressFromDataNode(dn)
|
||||
for _, diskInfo := range dn.GetDiskInfos() {
|
||||
for _, v := range diskInfo.GetVolumeInfos() {
|
||||
if v.GetCollection() == matchCollection {
|
||||
if collectionMatcher.Matches(v.GetCollection()) {
|
||||
targets = append(targets, volumeMarkTarget{
|
||||
volumeId: needle.VolumeId(v.GetId()),
|
||||
sourceVolumeServer: sourceVolumeServer,
|
||||
@@ -162,7 +161,7 @@ func collectVolumeMarkTargetsByCollection(topoInfo *master_pb.TopologyInfo, coll
|
||||
}
|
||||
})
|
||||
if len(targets) == 0 {
|
||||
return nil, fmt.Errorf("collection %s has no volumes", collection)
|
||||
return nil, fmt.Errorf("no volumes match collection %s", collection)
|
||||
}
|
||||
return targets, nil
|
||||
}
|
||||
Reference in new issue
Block a user