aboutsummaryrefslogtreecommitdiff
path: root/weed/shell/command_volume_list.go
diff options
context:
space:
mode:
Diffstat (limited to 'weed/shell/command_volume_list.go')
-rw-r--r--weed/shell/command_volume_list.go24
1 files changed, 22 insertions, 2 deletions
diff --git a/weed/shell/command_volume_list.go b/weed/shell/command_volume_list.go
index 9872736a4..f57c7f5be 100644
--- a/weed/shell/command_volume_list.go
+++ b/weed/shell/command_volume_list.go
@@ -13,6 +13,7 @@ import (
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
"github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding"
"github.com/seaweedfs/seaweedfs/weed/storage/types"
+ "github.com/seaweedfs/seaweedfs/weed/util"
"io"
)
@@ -248,8 +249,27 @@ func (c *commandVolumeList) writeDiskInfo(writer io.Writer, t *master_pb.DiskInf
if destroyTime > 0 {
expireAtString = fmt.Sprintf("expireAt:%s", time.Unix(int64(destroyTime), 0).Format("2006-01-02 15:04:05"))
}
- output(verbosityLevel >= 5, writer, " ec volume id:%v collection:%v shards:%v %s\n",
- ecShardInfo.Id, ecShardInfo.Collection, erasure_coding.ShardBits(ecShardInfo.EcIndexBits).ShardIds(), expireAtString)
+
+ // Build shard size information
+ shardIds := erasure_coding.ShardBits(ecShardInfo.EcIndexBits).ShardIds()
+ var totalSize int64
+ var shardSizeInfo string
+
+ if len(ecShardInfo.ShardSizes) > 0 {
+ var shardDetails []string
+ for _, shardId := range shardIds {
+ if size, found := erasure_coding.GetShardSize(ecShardInfo, erasure_coding.ShardId(shardId)); found {
+ shardDetails = append(shardDetails, fmt.Sprintf("%d:%s", shardId, util.BytesToHumanReadable(uint64(size))))
+ totalSize += size
+ } else {
+ shardDetails = append(shardDetails, fmt.Sprintf("%d:?", shardId))
+ }
+ }
+ shardSizeInfo = fmt.Sprintf(" sizes:[%s] total:%s", strings.Join(shardDetails, " "), util.BytesToHumanReadable(uint64(totalSize)))
+ }
+
+ output(verbosityLevel >= 5, writer, " ec volume id:%v collection:%v shards:%v%s %s\n",
+ ecShardInfo.Id, ecShardInfo.Collection, shardIds, shardSizeInfo, expireAtString)
}
output((volumeInfosFound || ecShardInfoFound) && verbosityLevel >= 4, writer, " Disk %s %+v \n", diskType, s)
return s