From 7ae8b1cc860b612171d73c7dfbf1e46b028c85bf Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Mon, 2 Dec 2019 23:38:56 -0800
Subject: [PATCH] show volume info in volume.list in weed shell

---
 weed/storage/volume_info.go | 48 ++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/weed/storage/volume_info.go b/weed/storage/volume_info.go
index 9bafa0877..6a33aa261 100644
--- a/weed/storage/volume_info.go
+++ b/weed/storage/volume_info.go
@@ -27,16 +27,18 @@ type VolumeInfo struct {
 
 func NewVolumeInfo(m *master_pb.VolumeInformationMessage) (vi VolumeInfo, err error) {
 	vi = VolumeInfo{
-		Id:               needle.VolumeId(m.Id),
-		Size:             m.Size,
-		Collection:       m.Collection,
-		FileCount:        int(m.FileCount),
-		DeleteCount:      int(m.DeleteCount),
-		DeletedByteCount: m.DeletedByteCount,
-		ReadOnly:         m.ReadOnly,
-		Version:          needle.Version(m.Version),
-		CompactRevision:  m.CompactRevision,
-		ModifiedAtSecond: m.ModifiedAtSecond,
+		Id:                needle.VolumeId(m.Id),
+		Size:              m.Size,
+		Collection:        m.Collection,
+		FileCount:         int(m.FileCount),
+		DeleteCount:       int(m.DeleteCount),
+		DeletedByteCount:  m.DeletedByteCount,
+		ReadOnly:          m.ReadOnly,
+		Version:           needle.Version(m.Version),
+		CompactRevision:   m.CompactRevision,
+		ModifiedAtSecond:  m.ModifiedAtSecond,
+		RemoteStorageName: m.RemoteStorageName,
+		RemoteStorageKey:  m.RemoteStorageKey,
 	}
 	rp, e := NewReplicaPlacementFromByte(byte(m.ReplicaPlacement))
 	if e != nil {
@@ -69,18 +71,20 @@ func (vi VolumeInfo) String() string {
 
 func (vi VolumeInfo) ToVolumeInformationMessage() *master_pb.VolumeInformationMessage {
 	return &master_pb.VolumeInformationMessage{
-		Id:               uint32(vi.Id),
-		Size:             uint64(vi.Size),
-		Collection:       vi.Collection,
-		FileCount:        uint64(vi.FileCount),
-		DeleteCount:      uint64(vi.DeleteCount),
-		DeletedByteCount: vi.DeletedByteCount,
-		ReadOnly:         vi.ReadOnly,
-		ReplicaPlacement: uint32(vi.ReplicaPlacement.Byte()),
-		Version:          uint32(vi.Version),
-		Ttl:              vi.Ttl.ToUint32(),
-		CompactRevision:  vi.CompactRevision,
-		ModifiedAtSecond: vi.ModifiedAtSecond,
+		Id:                uint32(vi.Id),
+		Size:              uint64(vi.Size),
+		Collection:        vi.Collection,
+		FileCount:         uint64(vi.FileCount),
+		DeleteCount:       uint64(vi.DeleteCount),
+		DeletedByteCount:  vi.DeletedByteCount,
+		ReadOnly:          vi.ReadOnly,
+		ReplicaPlacement:  uint32(vi.ReplicaPlacement.Byte()),
+		Version:           uint32(vi.Version),
+		Ttl:               vi.Ttl.ToUint32(),
+		CompactRevision:   vi.CompactRevision,
+		ModifiedAtSecond:  vi.ModifiedAtSecond,
+		RemoteStorageName: vi.RemoteStorageName,
+		RemoteStorageKey:  vi.RemoteStorageKey,
 	}
 }