opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-24 23:41:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): guest start check vcpu is enough

Browse Source
This commit is contained in:
wanyaoqi
2023-10-25 23:55:26 +08:00
parent 0508225799
commit 835bdf2c15
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guest_actions.go
+6 -2
View File
@@ -1028,11 +1028,15 @@ func (self *SGuest) PerformStart(
}
if !self.guestDisksStorageTypeIsShared() {
host, _ := self.GetHost()
guestsMem, err := host.GetNotReadyGuestsMemorySize()
guestStats, err := host.GetNotReadyGuestsStat()
if err != nil {
return nil, err
}
if float32(guestsMem+self.VmemSize) > host.GetVirtualMemorySize() {
if float32(guestStats.GuestVcpuCount+self.VcpuCount) > host.GetVirtualCPUCount() {
return nil, httperrors.NewInsufficientResourceError("host virtual cpu not enough")
}
if float32(guestStats.GuestVmemSize+self.VmemSize) > host.GetVirtualMemorySize() {
return nil, httperrors.NewInsufficientResourceError("host virtual memory not enough")
}
}
pkg/compute/models/hosts.go
+3 -3
View File
@@ -1664,7 +1664,7 @@ func (hh *SHost) GetRunningGuestCount() (int, error) {
return q.CountWithError()
}
func (hh *SHost) GetNotReadyGuestsMemorySize() (int, error) {
func (hh *SHost) GetNotReadyGuestsStat() (*SHostGuestResourceUsage, error) {
guests := GuestManager.Query().SubQuery()
q := guests.Query(sqlchemy.COUNT("guest_count"),
sqlchemy.SUM("guest_vcpu_count", guests.Field("vcpu_count")),
@@ -1676,9 +1676,9 @@ func (hh *SHost) GetNotReadyGuestsMemorySize() (int, error) {
stat := SHostGuestResourceUsage{}
err := q.First(&stat)
if err != nil {
return -1, err
return nil, err
}
return stat.GuestVmemSize, nil
return &stat, nil
}
func (hh *SHost) GetRunningGuestResourceUsage() *SHostGuestResourceUsage {