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

Automatic merge from release/2.4.0 -> release/2.5.0

Browse Source 
* commit '7efda942b5035ff4b9da700693c593df519e5012':
  region 修复: 宿主机仪表盘数据缺失
This commit is contained in:
邱剑
2018-12-26 11:41:47 +08:00
parent 08a78c841f 7efda942b5
commit 3b4e9e9790
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/hosts.go
+16 -7
View File
@@ -922,16 +922,18 @@ type SStorageCapacity struct {
VCapacity int
}
func (capa SStorageCapacity) GetFree() int {
return capa.VCapacity - capa.Used - capa.Wasted
}
func (self *SHost) GetAttachedStorageCapacity() SStorageCapacity {
ret := SStorageCapacity{}
storages := self.GetAttachedStorages("")
if storages != nil {
for _, s := range storages {
ret.Capacity += s.GetCapacity()
ret.Used += s.GetUsedCapacity(tristate.True)
ret.Wasted += s.GetUsedCapacity(tristate.False)
ret.VCapacity += int(float32(s.GetCapacity()) * s.GetOvercommitBound())
}
for _, s := range storages {
ret.Capacity += s.GetCapacity()
ret.Used += s.GetUsedCapacity(tristate.True)
ret.Wasted += s.GetUsedCapacity(tristate.False)
ret.VCapacity += int(float32(s.GetCapacity()) * s.GetOvercommitBound())
}
return ret
}
@@ -2086,6 +2088,7 @@ func (self *SHost) getMoreDetails(ctx context.Context, extra *jsonutils.JSONDict
}
extra.Add(jsonutils.NewInt(int64(self.GetGuestCount())), "guests")
extra.Add(jsonutils.NewInt(int64(self.GetNonsystemGuestCount())), "nonsystem_guests")
extra.Add(jsonutils.NewInt(int64(self.GetRunningGuestCount())), "running_guests")
totalCpu := self.GetCpuCount()
cpuCommitRate := 0.0
if totalCpu > 0 && usage.GuestVcpuCount > 0 {
@@ -2098,6 +2101,12 @@ func (self *SHost) getMoreDetails(ctx context.Context, extra *jsonutils.JSONDict
memCommitRate = float64(usage.GuestVmemSize) * 1.0 / float64(totalMem)
}
extra.Add(jsonutils.NewFloat(memCommitRate), "mem_commit_rate")
capa := self.GetAttachedStorageCapacity()
extra.Add(jsonutils.NewInt(int64(capa.Capacity)), "storage")
extra.Add(jsonutils.NewInt(int64(capa.Used)), "storage_used")
extra.Add(jsonutils.NewInt(int64(capa.Wasted)), "storage_waste")
extra.Add(jsonutils.NewInt(int64(capa.VCapacity)), "storage_virtual")
extra.Add(jsonutils.NewInt(int64(capa.GetFree())), "storage_free")
extra.Add(self.GetHardwareSpecification(), "spec")
// extra = self.SManagedResourceBase.getExtraDetails(ctx, extra)