gian/cubefs
1
0
Fork 0
mirror of https://github.com/cubefs/cubefs.git synced 2026-08-02 02:00:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(clustermgr): total free chunk only stats normal disk

Browse Source 
#1000518879

Signed-off-by: tangdeyi <tangdeyi@oppo.com>
This commit is contained in:
tangdeyi 2025-12-26 18:51:20 +08:00 committed by 梁曟風
parent 6518595f6e
commit 412fa7a48d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
blobstore/clustermgr/cluster/cluster.go
View File

@ -970,6 +970,7 @@ func (d *manager) generateDiskSetStorage(ctx context.Context, disks []*diskItem,
if diskStatInfosM[idc] == nil {
diskStatInfosM[idc] = &clustermgr.DiskStatInfo{IDC: idc}
}
status := disk.info.Status
blobNodeHeartbeatInfo, isBlobNodeDisk := disk.info.extraInfo.(*clustermgr.DiskHeartBeatInfo)
if isBlobNodeDisk {
free = blobNodeHeartbeatInfo.Free
@ -980,8 +981,10 @@ func (d *manager) generateDiskSetStorage(ctx context.Context, disks []*diskItem,
diskFreeItem = blobNodeHeartbeatInfo.OversoldFreeChunkCnt
}
diskMaxItem = blobNodeHeartbeatInfo.MaxChunkCnt
diskStatInfosM[idc].TotalFreeChunk += originalDiskFreeItem
diskStatInfosM[idc].TotalOversoldFreeChunk += diskFreeItem
if status == proto.DiskStatusNormal {
diskStatInfosM[idc].TotalFreeChunk += originalDiskFreeItem
diskStatInfosM[idc].TotalOversoldFreeChunk += diskFreeItem
}
diskStatInfosM[idc].TotalChunk += diskMaxItem
}
shardNodeHeartbeatInfo, isShardNodeDisk := disk.info.extraInfo.(*clustermgr.ShardNodeDiskHeartbeatInfo)
@ -990,11 +993,12 @@ func (d *manager) generateDiskSetStorage(ctx context.Context, disks []*diskItem,
size = shardNodeHeartbeatInfo.Size
diskFreeItem = int64(shardNodeHeartbeatInfo.FreeShardCnt)
diskMaxItem = int64(shardNodeHeartbeatInfo.MaxShardCnt)
diskStatInfosM[idc].TotalFreeShard += diskFreeItem
if status == proto.DiskStatusNormal {
diskStatInfosM[idc].TotalFreeShard += diskFreeItem
}
diskStatInfosM[idc].TotalShard += diskMaxItem
}
readonly := disk.info.Readonly
status := disk.info.Status
// rack can be the same in different idc, so we make rack string with idc
rack = idc + "-" + rack
spaceStatInfo.TotalDisk += 1