opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: ceph stats backward compatible with ceph 12.x (#20220)

Browse Source 
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
Jian Qiu
2024-05-10 14:55:00 +08:00
committed by GitHub
co-authored by Qiu Jian
parent d98a9bf271
commit fcc042ebc7
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/cephutils/ceph.go
+10 -2
View File
@@ -157,6 +157,10 @@ func (cli *CephClient) CreateImage(name string, sizeMb int64) (*SImage, error) {
return image, cli.run("rbd", opts, false)
}
/*
* {"kb_used":193408,"bytes_used":198049792,"percent_used":0.32,"bytes_used2":0,"percent_used2":0.00,"osd_max_used":0,"osd_max_used_ratio":0.32,"max_avail":61003137024,"objects":1,"origin_bytes":0,"compress_bytes":0}
* {"stored":6198990973173,"objects":1734699,"kb_used":12132844593,"bytes_used":12424032862699,"percent_used":0.30800202488899231,"max_avail":13956734255104}
*/
func (cli *CephClient) GetCapacity() (*SCapacity, error) {
result := &SCapacity{}
opts := cli.options()
@@ -174,9 +178,13 @@ func (cli *CephClient) GetCapacity() (*SCapacity, error) {
result.UsedCapacitySizeKb = stats.Stats.TotalUsedBytes / 1024
for _, pool := range stats.Pools {
if pool.Name == cli.pool {
result.UsedCapacitySizeKb = int64(pool.Stats.Stored / 1024)
if pool.Stats.Stored > 0 {
result.UsedCapacitySizeKb = int64(pool.Stats.Stored / 1024)
} else {
result.UsedCapacitySizeKb = int64(pool.Stats.BytesUsed / 1024)
}
if pool.Stats.MaxAvail > 0 {
result.CapacitySizeKb = int64(pool.Stats.MaxAvail/1024 + int64(pool.Stats.Stored/1024))
result.CapacitySizeKb = int64(pool.Stats.MaxAvail/1024) + result.UsedCapacitySizeKb
}
}
}