gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix inconsistent TTL reporting in volume.list #8158 (#8164)

Browse Source 
* fix inconsistent TTL reporting in volume.list #8158

* simplify volume.list output using vi.String()
This commit is contained in:
Chris Lu
2026-01-29 14:16:42 -08:00
committed by GitHub
parent 8b61fd77b5
commit 550a4ff761
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
weed/shell/command_volume_list.go
View File

@@ -11,6 +11,7 @@ import (
"time" "time"
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb" "github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
"github.com/seaweedfs/seaweedfs/weed/storage"
"github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding" "github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding"
"github.com/seaweedfs/seaweedfs/weed/storage/types" "github.com/seaweedfs/seaweedfs/weed/storage/types"
"github.com/seaweedfs/seaweedfs/weed/util" "github.com/seaweedfs/seaweedfs/weed/util"
@@ -257,7 +258,14 @@ func (c *commandVolumeList) writeDiskInfo(writer io.Writer, t *master_pb.DiskInf
} }
func writeVolumeInformationMessage(writer io.Writer, t *master_pb.VolumeInformationMessage, verbosityLevel int) statistics { func writeVolumeInformationMessage(writer io.Writer, t *master_pb.VolumeInformationMessage, verbosityLevel int) statistics {
output(verbosityLevel >= 5, writer, " volume %+v \n", t) if verbosityLevel >= 5 {
vi, err := storage.NewVolumeInfo(t)
if err == nil {
output(true, writer, " volume %s \n", vi.String())
} else {
output(true, writer, " volume %+v \n", t)
}
}
return statistics{ return statistics{
Size: t.Size, Size: t.Size,
FileCount: t.FileCount, FileCount: t.FileCount,

4
weed/storage/volume_info.go
View File

@@ -75,8 +75,8 @@ func (vi VolumeInfo) IsRemote() bool {
} }
func (vi VolumeInfo) String() string { func (vi VolumeInfo) String() string {
return fmt.Sprintf("Id:%d, Size:%d, ReplicaPlacement:%s, Collection:%s, Version:%v, FileCount:%d, DeleteCount:%d, DeletedByteCount:%d, ReadOnly:%v", return fmt.Sprintf("Id:%d, Size:%d, ReplicaPlacement:%s, Collection:%s, Version:%v, Ttl:%s, FileCount:%d, DeleteCount:%d, DeletedByteCount:%d, ReadOnly:%v, ModifiedAtSecond:%d",
vi.Id, vi.Size, vi.ReplicaPlacement, vi.Collection, vi.Version, vi.FileCount, vi.DeleteCount, vi.DeletedByteCount, vi.ReadOnly) vi.Id, vi.Size, vi.ReplicaPlacement, vi.Collection, vi.Version, vi.Ttl.String(), vi.FileCount, vi.DeleteCount, vi.DeletedByteCount, vi.ReadOnly, vi.ModifiedAtSecond)
} }
func (vi VolumeInfo) ToVolumeInformationMessage() *master_pb.VolumeInformationMessage { func (vi VolumeInfo) ToVolumeInformationMessage() *master_pb.VolumeInformationMessage {