From a79f5bd0d5ca01d4e53f016f42cb2103f9d7dad1 Mon Sep 17 00:00:00 2001 From: chrislu <chris.lu@gmail.com> Date: Mon, 4 Jul 2022 13:46:32 -0700 Subject: [PATCH] adjust used size reporting --- weed/shell/command_fs_du.go | 2 +- weed/topology/volume_location_list.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/weed/shell/command_fs_du.go b/weed/shell/command_fs_du.go index 71003714d..919c052d5 100644 --- a/weed/shell/command_fs_du.go +++ b/weed/shell/command_fs_du.go @@ -76,7 +76,7 @@ func duTraverseDirectory(writer io.Writer, filerClient filer_pb.FilerClient, dir } if name != "" && !entry.IsDirectory { - fmt.Fprintf(writer, "block:%4d\tbyte:%10d\t%s/%s\n", fileBlockCount, fileByteCount, dir, entry.Name) + fmt.Fprintf(writer, "block:%4d\tlogical size:%10d\t%s/%s\n", fileBlockCount, fileByteCount, dir, entry.Name) } return nil }) diff --git a/weed/topology/volume_location_list.go b/weed/topology/volume_location_list.go index 03580ae5b..00bd8d199 100644 --- a/weed/topology/volume_location_list.go +++ b/weed/topology/volume_location_list.go @@ -82,12 +82,13 @@ func (dnll *VolumeLocationList) Refresh(freshThreshHold int64) { } } +// Stats returns logic size and count func (dnll *VolumeLocationList) Stats(vid needle.VolumeId, freshThreshHold int64) (size uint64, fileCount int) { for _, dnl := range dnll.list { if dnl.LastSeen < freshThreshHold { vinfo, err := dnl.GetVolumesById(vid) if err == nil { - return (vinfo.Size - vinfo.DeletedByteCount) * uint64(len(dnll.list)), vinfo.FileCount - vinfo.DeleteCount + return (vinfo.Size - vinfo.DeletedByteCount), vinfo.FileCount - vinfo.DeleteCount } } }