mirror/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-11-28 13:31:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

adjust printing

Browse Source
This commit is contained in:
Chris Lu 2021-02-16 10:55:30 -08:00
parent 68775d29e3
commit 0611233f16
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
weed/shell/command_volume_list.go
View File

@ -48,6 +48,9 @@ func (c *commandVolumeList) Do(args []string, commandEnv *CommandEnv, writer io.
func diskInfosToString(diskInfos map[string]*master_pb.DiskInfo) string { func diskInfosToString(diskInfos map[string]*master_pb.DiskInfo) string {
var buf bytes.Buffer var buf bytes.Buffer
for diskType, diskInfo := range diskInfos { for diskType, diskInfo := range diskInfos {
if diskType == "" {
diskType = "hdd"
}
fmt.Fprintf(&buf, " %s(volume:%d/%d active:%d free:%d remote:%d)", diskType, diskInfo.VolumeCount, diskInfo.MaxVolumeCount, diskInfo.ActiveVolumeCount, diskInfo.FreeVolumeCount, diskInfo.RemoteVolumeCount) fmt.Fprintf(&buf, " %s(volume:%d/%d active:%d free:%d remote:%d)", diskType, diskInfo.VolumeCount, diskInfo.MaxVolumeCount, diskInfo.ActiveVolumeCount, diskInfo.FreeVolumeCount, diskInfo.RemoteVolumeCount)
} }
return buf.String() return buf.String()
@ -107,7 +110,11 @@ func writeDataNodeInfo(writer io.Writer, t *master_pb.DataNodeInfo) statistics {
func writeDiskInfo(writer io.Writer, t *master_pb.DiskInfo) statistics { func writeDiskInfo(writer io.Writer, t *master_pb.DiskInfo) statistics {
var s statistics var s statistics
fmt.Fprintf(writer, " Disk %s(%s)\n", t.Type, diskInfoToString(t)) diskType := t.Type
if diskType == "" {
diskType = "hdd"
}
fmt.Fprintf(writer, " Disk %s(%s)\n", diskType, diskInfoToString(t))
sort.Slice(t.VolumeInfos, func(i, j int) bool { sort.Slice(t.VolumeInfos, func(i, j int) bool {
return t.VolumeInfos[i].Id < t.VolumeInfos[j].Id return t.VolumeInfos[i].Id < t.VolumeInfos[j].Id
}) })
@ -117,7 +124,7 @@ func writeDiskInfo(writer io.Writer, t *master_pb.DiskInfo) statistics {
for _, ecShardInfo := range t.EcShardInfos { for _, ecShardInfo := range t.EcShardInfos {
fmt.Fprintf(writer, " ec volume id:%v collection:%v shards:%v\n", ecShardInfo.Id, ecShardInfo.Collection, erasure_coding.ShardBits(ecShardInfo.EcIndexBits).ShardIds()) fmt.Fprintf(writer, " ec volume id:%v collection:%v shards:%v\n", ecShardInfo.Id, ecShardInfo.Collection, erasure_coding.ShardBits(ecShardInfo.EcIndexBits).ShardIds())
} }
fmt.Fprintf(writer, " Disk %s %+v \n", t.Type, s) fmt.Fprintf(writer, " Disk %s %+v \n", diskType, s)
return s return s
} }