diff options
Diffstat (limited to 'weed/shell/command_volume_list.go')
| -rw-r--r-- | weed/shell/command_volume_list.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/weed/shell/command_volume_list.go b/weed/shell/command_volume_list.go index b4f94df1a..70b7553b3 100644 --- a/weed/shell/command_volume_list.go +++ b/weed/shell/command_volume_list.go @@ -8,6 +8,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding" "golang.org/x/exp/slices" "path/filepath" + "strings" "io" ) @@ -81,8 +82,8 @@ func diskInfoToString(diskInfo *master_pb.DiskInfo) string { func (c *commandVolumeList) writeTopologyInfo(writer io.Writer, t *master_pb.TopologyInfo, volumeSizeLimitMb uint64, verbosityLevel int) statistics { output(verbosityLevel >= 0, writer, "Topology volumeSizeLimit:%d MB%s\n", volumeSizeLimitMb, diskInfosToString(t.DiskInfos)) - slices.SortFunc(t.DataCenterInfos, func(a, b *master_pb.DataCenterInfo) bool { - return a.Id < b.Id + slices.SortFunc(t.DataCenterInfos, func(a, b *master_pb.DataCenterInfo) int { + return strings.Compare(a.Id, b.Id) }) var s statistics for _, dc := range t.DataCenterInfos { @@ -98,8 +99,8 @@ func (c *commandVolumeList) writeTopologyInfo(writer io.Writer, t *master_pb.Top func (c *commandVolumeList) writeDataCenterInfo(writer io.Writer, t *master_pb.DataCenterInfo, verbosityLevel int) statistics { output(verbosityLevel >= 1, writer, " DataCenter %s%s\n", t.Id, diskInfosToString(t.DiskInfos)) var s statistics - slices.SortFunc(t.RackInfos, func(a, b *master_pb.RackInfo) bool { - return a.Id < b.Id + slices.SortFunc(t.RackInfos, func(a, b *master_pb.RackInfo) int { + return strings.Compare(a.Id, b.Id) }) for _, r := range t.RackInfos { if *c.rack != "" && *c.rack != r.Id { @@ -114,8 +115,8 @@ func (c *commandVolumeList) writeDataCenterInfo(writer io.Writer, t *master_pb.D func (c *commandVolumeList) writeRackInfo(writer io.Writer, t *master_pb.RackInfo, verbosityLevel int) statistics { output(verbosityLevel >= 2, writer, " Rack %s%s\n", t.Id, diskInfosToString(t.DiskInfos)) var s statistics - slices.SortFunc(t.DataNodeInfos, func(a, b *master_pb.DataNodeInfo) bool { - return a.Id < b.Id + slices.SortFunc(t.DataNodeInfos, func(a, b *master_pb.DataNodeInfo) int { + return strings.Compare(a.Id, b.Id) }) for _, dn := range t.DataNodeInfos { if *c.dataNode != "" && *c.dataNode != dn.Id { @@ -159,8 +160,8 @@ func (c *commandVolumeList) writeDiskInfo(writer io.Writer, t *master_pb.DiskInf diskType = "hdd" } output(verbosityLevel >= 4, writer, " Disk %s(%s)\n", diskType, diskInfoToString(t)) - slices.SortFunc(t.VolumeInfos, func(a, b *master_pb.VolumeInformationMessage) bool { - return a.Id < b.Id + slices.SortFunc(t.VolumeInfos, func(a, b *master_pb.VolumeInformationMessage) int { + return int(a.Id - b.Id) }) for _, vi := range t.VolumeInfos { if c.isNotMatchDiskInfo(vi.ReadOnly, vi.Collection, vi.Id) { |