mirror/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-12-20 14:27:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

[shell] volume.list show only writable volumes (#6338)

Browse Source 
* show only writable volumes

* fix import
This commit is contained in:
Konstantin Lebedev 2024-12-11 19:06:15 +02:00 committed by GitHub
parent c37281735e
commit 700b95304b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
weed/shell/command_volume_list.go
View File

@ -25,7 +25,9 @@ type commandVolumeList struct {
rack *string rack *string
dataNode *string dataNode *string
readonly *bool readonly *bool
writable *bool
volumeId *uint64 volumeId *uint64
volumeSizeLimitMb uint64
} }
func (c *commandVolumeList) Name() string { func (c *commandVolumeList) Name() string {
@ -49,7 +51,8 @@ func (c *commandVolumeList) Do(args []string, commandEnv *CommandEnv, writer io.
volumeListCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError) volumeListCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
verbosityLevel := volumeListCommand.Int("v", 5, "verbose mode: 0, 1, 2, 3, 4, 5") verbosityLevel := volumeListCommand.Int("v", 5, "verbose mode: 0, 1, 2, 3, 4, 5")
c.collectionPattern = volumeListCommand.String("collectionPattern", "", "match with wildcard characters '*' and '?'") c.collectionPattern = volumeListCommand.String("collectionPattern", "", "match with wildcard characters '*' and '?'")
c.readonly = volumeListCommand.Bool("readonly", false, "show only readonly") c.readonly = volumeListCommand.Bool("readonly", false, "show only readonly volumes")
c.writable = volumeListCommand.Bool("writable", false, "show only writable volumes")
c.volumeId = volumeListCommand.Uint64("volumeId", 0, "show only volume id") c.volumeId = volumeListCommand.Uint64("volumeId", 0, "show only volume id")
c.dataCenter = volumeListCommand.String("dataCenter", "", "show volumes only from the specified data center") c.dataCenter = volumeListCommand.String("dataCenter", "", "show volumes only from the specified data center")
c.rack = volumeListCommand.String("rack", "", "show volumes only from the specified rack") c.rack = volumeListCommand.String("rack", "", "show volumes only from the specified rack")
@ -60,12 +63,13 @@ func (c *commandVolumeList) Do(args []string, commandEnv *CommandEnv, writer io.
} }
// collect topology information // collect topology information
topologyInfo, volumeSizeLimitMb, err := collectTopologyInfo(commandEnv, 0) var topologyInfo *master_pb.TopologyInfo
topologyInfo, c.volumeSizeLimitMb, err = collectTopologyInfo(commandEnv, 0)
if err != nil { if err != nil {
return err return err
} }
c.writeTopologyInfo(writer, topologyInfo, volumeSizeLimitMb, *verbosityLevel) c.writeTopologyInfo(writer, topologyInfo, c.volumeSizeLimitMb, *verbosityLevel)
return nil return nil
} }
@ -161,10 +165,13 @@ func (c *commandVolumeList) writeDataNodeInfo(writer io.Writer, t *master_pb.Dat
return s return s
} }
func (c *commandVolumeList) isNotMatchDiskInfo(readOnly bool, collection string, volumeId uint32) bool { func (c *commandVolumeList) isNotMatchDiskInfo(readOnly bool, collection string, volumeId uint32, volumeSize int64) bool {
if *c.readonly && !readOnly { if *c.readonly && !readOnly {
return true return true
} }
if *c.writable && (readOnly || volumeSize == -1 || c.volumeSizeLimitMb >= uint64(volumeSize)) {
return true
}
if *c.collectionPattern != "" { if *c.collectionPattern != "" {
if matched, _ := filepath.Match(*c.collectionPattern, collection); !matched { if matched, _ := filepath.Match(*c.collectionPattern, collection); !matched {
return true return true
@ -187,7 +194,7 @@ func (c *commandVolumeList) writeDiskInfo(writer io.Writer, t *master_pb.DiskInf
}) })
volumeInfosFound := false volumeInfosFound := false
for _, vi := range t.VolumeInfos { for _, vi := range t.VolumeInfos {
if c.isNotMatchDiskInfo(vi.ReadOnly, vi.Collection, vi.Id) { if c.isNotMatchDiskInfo(vi.ReadOnly, vi.Collection, vi.Id, int64(vi.Size)) {
continue continue
} }
if !volumeInfosFound { if !volumeInfosFound {
@ -199,7 +206,7 @@ func (c *commandVolumeList) writeDiskInfo(writer io.Writer, t *master_pb.DiskInf
} }
ecShardInfoFound := false ecShardInfoFound := false
for _, ecShardInfo := range t.EcShardInfos { for _, ecShardInfo := range t.EcShardInfos {
if c.isNotMatchDiskInfo(false, ecShardInfo.Collection, ecShardInfo.Id) { if c.isNotMatchDiskInfo(false, ecShardInfo.Collection, ecShardInfo.Id, -1) {
continue continue
} }
if !volumeInfosFound && !ecShardInfoFound { if !volumeInfosFound && !ecShardInfoFound {