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 #16890 from zexi/automated-cherry-pick-of-#16888-upstream-master

Browse Source 
Automated cherry pick of #16888: fix(scheduler): skip load esxi network free-port cache
This commit is contained in:
Zexi Li
2023-04-27 09:35:55 +08:00
committed by GitHub
parent 3ad90db0f4 b667a4ccc3
commit 175a584847
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduler/cache/candidate/base.go
Vendored
+9 -2
View File
@@ -337,8 +337,15 @@ func newNetworkGetter() *networkGetter {
}
}
func shouldSkipLoadNetFromCache(host *computemodels.SHost) bool {
if host.IsEmulated || host.HostType == computeapi.HOST_TYPE_ESXI {
return true
}
return false
}
func (g *networkGetter) GetFreePort(host *computemodels.SHost, n *computemodels.SNetwork) (int, error) {
if host.IsEmulated {
if shouldSkipLoadNetFromCache(host) {
// not calculate emulated host's network free address
return -1, nil
}
@@ -453,7 +460,7 @@ func (b *BaseHostDesc) GetFreePort(netId string) int {
if selNet == nil {
return 0
}
if b.IsEmulated {
if shouldSkipLoadNetFromCache(b.SHost) {
freeCount, _ := selNet.GetFreeAddressCount()
return freeCount
}