aboutsummaryrefslogtreecommitdiff
path: root/weed/topology
diff options
context:
space:
mode:
authorChris Lu <chrislusf@users.noreply.github.com>2021-02-26 09:15:08 -0800
committerGitHub <noreply@github.com>2021-02-26 09:15:08 -0800
commit7a045de6e0b5ece9f07b7f2df3bbee41a9d1b0db (patch)
treebfd0f44434b321e0a319dfab54d4192e5f0d2cf0 /weed/topology
parentc276117fef7d871e09ca82f9d4e7c088ce670204 (diff)
parent5f7b024891f0e113961e389d4f9449289db4c60a (diff)
downloadseaweedfs-7a045de6e0b5ece9f07b7f2df3bbee41a9d1b0db.tar.xz
seaweedfs-7a045de6e0b5ece9f07b7f2df3bbee41a9d1b0db.zip
Merge pull request #1845 from Woellchen/show-real-disk-usage
Diffstat (limited to 'weed/topology')
-rw-r--r--weed/topology/volume_layout.go2
-rw-r--r--weed/topology/volume_location_list.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/weed/topology/volume_layout.go b/weed/topology/volume_layout.go
index 5784c894b..c7e171248 100644
--- a/weed/topology/volume_layout.go
+++ b/weed/topology/volume_layout.go
@@ -432,7 +432,7 @@ func (vl *VolumeLayout) Stats() *VolumeLayoutStats {
if vl.readonlyVolumes.IsTrue(vid) {
ret.TotalSize += size
} else {
- ret.TotalSize += vl.volumeSizeLimit
+ ret.TotalSize += vl.volumeSizeLimit * uint64(vll.Length())
}
}
diff --git a/weed/topology/volume_location_list.go b/weed/topology/volume_location_list.go
index 64c13ca52..548c4cd25 100644
--- a/weed/topology/volume_location_list.go
+++ b/weed/topology/volume_location_list.go
@@ -82,7 +82,7 @@ func (dnll *VolumeLocationList) Stats(vid needle.VolumeId, freshThreshHold int64
if dnl.LastSeen < freshThreshHold {
vinfo, err := dnl.GetVolumesById(vid)
if err == nil {
- return vinfo.Size - vinfo.DeletedByteCount, vinfo.FileCount - vinfo.DeleteCount
+ return (vinfo.Size - vinfo.DeletedByteCount) * uint64(len(dnll.list)), vinfo.FileCount - vinfo.DeleteCount
}
}
}