opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2707 from zexi/bugfix/scheduler-reserverd-resource

Browse Source 
scheduler: fix reserved resource out of limit bug
This commit is contained in:
yunion-ci-robot
2019-09-02 18:53:16 +08:00
committed by GitHub
parent ce63ff455f 8f34593113
commit 365a765932
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduler/cache/candidate/hosts.go
Vendored
+11 -5
View File
@@ -181,7 +181,7 @@ func NewGuestReservedResourceByBuilder(b *HostBuilder, host *computemodels.SHost
return
}
func NewGuestReservedResourceUsedByBuilder(b *HostBuilder, host *computemodels.SHost) (ret *ReservedResource, err error) {
func NewGuestReservedResourceUsedByBuilder(b *HostBuilder, host *computemodels.SHost, free *ReservedResource) (ret *ReservedResource, err error) {
ret = NewReservedResource(0, 0, 0)
gst := b.getIsolatedDeviceGuests(host.Id)
if len(gst) == 0 {
@@ -211,9 +211,15 @@ func NewGuestReservedResourceUsedByBuilder(b *HostBuilder, host *computemodels.S
cpu += int64(g.VcpuCount)
mem += int64(g.VmemSize)
}
ret.CPUCount = cpu
ret.MemorySize = mem
ret.StorageSize = disk
usedF := func(used, free int64) int64 {
if used <= free {
return used
}
return free
}
ret.CPUCount = usedF(cpu, free.CPUCount)
ret.MemorySize = usedF(mem, free.MemorySize)
ret.StorageSize = usedF(disk, free.StorageSize)
return
}
@@ -884,7 +890,7 @@ func (b *HostBuilder) buildOne(host *computemodels.SHost) (interface{}, error) {
desc.MemCmtbound = host.GetMemoryOvercommitBound()
desc.GuestReservedResource = NewGuestReservedResourceByBuilder(b, host)
guestRsvdUsed, err := NewGuestReservedResourceUsedByBuilder(b, host)
guestRsvdUsed, err := NewGuestReservedResourceUsedByBuilder(b, host, desc.GuestReservedResource)
if err != nil {
return nil, err
}