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 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.
130 lines
3.6 KiB
Go
130 lines
3.6 KiB
Go
package shell
|
|
|
|
import (
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/needle"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/super_block"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/types"
|
|
)
|
|
|
|
func init() {
|
|
Commands = append(Commands, &commandGrow{})
|
|
}
|
|
|
|
type commandGrow struct {
|
|
}
|
|
|
|
func (c *commandGrow) Name() string {
|
|
return "volume.grow"
|
|
}
|
|
|
|
func (c *commandGrow) Help() string {
|
|
return `grow volumes
|
|
|
|
volume.grow [-collection=<collection name>] [-dataCenter=<data center name>]
|
|
|
|
`
|
|
}
|
|
|
|
func (c *commandGrow) HasTag(CommandTag) bool {
|
|
return false
|
|
}
|
|
|
|
func (c *commandGrow) Do(args []string, commandEnv *CommandEnv, writer io.Writer) (err error) {
|
|
|
|
volumeVacuumCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
|
|
growCount := volumeVacuumCommand.Uint("count", 2, "")
|
|
collection := volumeVacuumCommand.String("collection", "", "grow this collection; \""+CollectionDefault+"\" for the collection with no name")
|
|
dataCenter := volumeVacuumCommand.String("dataCenter", "", "grow volumes only from the specified data center")
|
|
rack := volumeVacuumCommand.String("rack", "", "grow volumes only from the specified rack")
|
|
dataNode := volumeVacuumCommand.String("dataNode", "", "grow volumes only from the specified data node")
|
|
diskType := volumeVacuumCommand.String("diskType", "", "grow volumes only from the specified disk type")
|
|
|
|
if err = volumeVacuumCommand.Parse(args); err != nil {
|
|
return nil
|
|
}
|
|
if *collection == "" {
|
|
return fmt.Errorf("collection option is required")
|
|
}
|
|
*collection = resolveCollectionName(*collection)
|
|
t, _, err := collectTopologyInfo(commandEnv, 0)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
volumeGrowRequest := &master_pb.VolumeGrowRequest{
|
|
Collection: *collection,
|
|
DataCenter: *dataCenter,
|
|
Rack: *rack,
|
|
DataNode: *dataNode,
|
|
WritableVolumeCount: uint32(*growCount),
|
|
}
|
|
|
|
collectionFound := false
|
|
dataCenterFound := *dataCenter == ""
|
|
rackFound := *rack == ""
|
|
dataNodeFound := *dataNode == ""
|
|
diskTypeFound := *diskType == ""
|
|
for _, dc := range t.DataCenterInfos {
|
|
if dc.Id == *dataCenter {
|
|
dataCenterFound = true
|
|
}
|
|
for _, r := range dc.RackInfos {
|
|
if r.Id == *rack {
|
|
rackFound = true
|
|
}
|
|
for _, dn := range r.DataNodeInfos {
|
|
if dn.Id == *dataNode {
|
|
dataNodeFound = true
|
|
}
|
|
for _, di := range dn.DiskInfos {
|
|
if !diskTypeFound && di.Type == types.ToDiskType(*diskType).String() {
|
|
diskTypeFound = true
|
|
}
|
|
for _, vi := range di.VolumeInfos {
|
|
if !collectionFound && vi.Collection == *collection {
|
|
replicaPlacement, _ := super_block.NewReplicaPlacementFromByte(byte(vi.ReplicaPlacement))
|
|
volumeGrowRequest.Ttl = needle.LoadTTLFromUint32(vi.Ttl).String()
|
|
volumeGrowRequest.DiskType = vi.DiskType
|
|
volumeGrowRequest.Replication = replicaPlacement.String()
|
|
collectionFound = true
|
|
}
|
|
if collectionFound && dataCenterFound && rackFound && dataNodeFound && diskTypeFound {
|
|
break
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if !dataCenterFound {
|
|
return fmt.Errorf("data center not found")
|
|
}
|
|
if !rackFound {
|
|
return fmt.Errorf("rack not found")
|
|
}
|
|
if !dataNodeFound {
|
|
return fmt.Errorf("data node not found")
|
|
}
|
|
if !diskTypeFound {
|
|
return fmt.Errorf("disk type not found")
|
|
}
|
|
if !collectionFound {
|
|
return fmt.Errorf("collection not found")
|
|
}
|
|
if err = commandEnv.MasterClient.WithClient(context.Background(), false, func(client master_pb.SeaweedClient) error {
|
|
if _, err := client.VolumeGrow(context.Background(), volumeGrowRequest); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}); err != nil {
|
|
return
|
|
}
|
|
|
|
return nil
|
|
}
|