diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2021-02-26 09:15:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-26 09:15:08 -0800 |
| commit | 7a045de6e0b5ece9f07b7f2df3bbee41a9d1b0db (patch) | |
| tree | bfd0f44434b321e0a319dfab54d4192e5f0d2cf0 /weed/server/master_grpc_server_volume.go | |
| parent | c276117fef7d871e09ca82f9d4e7c088ce670204 (diff) | |
| parent | 5f7b024891f0e113961e389d4f9449289db4c60a (diff) | |
| download | seaweedfs-7a045de6e0b5ece9f07b7f2df3bbee41a9d1b0db.tar.xz seaweedfs-7a045de6e0b5ece9f07b7f2df3bbee41a9d1b0db.zip | |
Merge pull request #1845 from Woellchen/show-real-disk-usage
Diffstat (limited to 'weed/server/master_grpc_server_volume.go')
| -rw-r--r-- | weed/server/master_grpc_server_volume.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/weed/server/master_grpc_server_volume.go b/weed/server/master_grpc_server_volume.go index 29aff5c0b..156afd4a1 100644 --- a/weed/server/master_grpc_server_volume.go +++ b/weed/server/master_grpc_server_volume.go @@ -77,7 +77,7 @@ func (ms *MasterServer) Assign(ctx context.Context, req *master_pb.AssignRequest if !ms.Topo.HasWritableVolume(option) { if ms.Topo.AvailableSpaceFor(option) <= 0 { - return nil, fmt.Errorf("no free volumes left for "+option.String()) + return nil, fmt.Errorf("no free volumes left for " + option.String()) } ms.vgLock.Lock() if !ms.Topo.HasWritableVolume(option) { @@ -122,11 +122,8 @@ func (ms *MasterServer) Statistics(ctx context.Context, req *master_pb.Statistic volumeLayout := ms.Topo.GetVolumeLayout(req.Collection, replicaPlacement, ttl, types.ToDiskType(req.DiskType)) stats := volumeLayout.Stats() - - totalSize := ms.Topo.GetDiskUsages().GetMaxVolumeCount() * int64(ms.option.VolumeSizeLimitMB) * 1024 * 1024 - resp := &master_pb.StatisticsResponse{ - TotalSize: uint64(totalSize), + TotalSize: stats.TotalSize, UsedSize: stats.UsedSize, FileCount: stats.FileCount, } |