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

fix: scheduler test ignore quota limit

Browse Source
This commit is contained in:
Qiu Jian
2020-05-27 10:10:39 +08:00
parent cb8f5e8864
commit 354a61632d
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduler/algorithm/predicates/quota_predicate.go
+13 -11
View File
@@ -93,6 +93,10 @@ func (p *SQuotaPredicate) Execute(u *core.Unit, c core.Candidater) (bool, []core
if len(d.PendingUsages) > 1 {
d.PendingUsages[1].Unmarshal(&regionPending)
}
computePending.ProjectId = d.Project
computePending.DomainId = d.Domain
regionPending.ProjectId = d.Project
regionPending.DomainId = d.Domain
computeKeys := c.Getter().GetQuotaKeys(d)
@@ -103,21 +107,19 @@ func (p *SQuotaPredicate) Execute(u *core.Unit, c core.Candidater) (bool, []core
ctx := context.Background()
minCnt := -1
if !computePending.IsEmpty() {
computeCnt, _ := quotas.GetQuotaCount(ctx, &computeQuota, computePending.GetKeys())
if computeCnt >= 0 && (minCnt < 0 || minCnt > computeCnt) {
minCnt = computeCnt
}
computeCnt, _ := quotas.GetQuotaCount(ctx, &computeQuota, computePending.GetKeys())
if computeCnt >= 0 && (minCnt < 0 || minCnt > computeCnt) {
minCnt = computeCnt
}
if !regionPending.IsEmpty() {
regionCnt, _ := quotas.GetQuotaCount(ctx, &regionQuota, regionPending.GetKeys())
if regionCnt >= 0 && (minCnt < 0 || minCnt > regionCnt) {
minCnt = regionCnt
}
regionCnt, _ := quotas.GetQuotaCount(ctx, &regionQuota, regionPending.GetKeys())
if regionCnt >= 0 && (minCnt < 0 || minCnt > regionCnt) {
minCnt = regionCnt
}
if minCnt >= 0 {
if minCnt > 0 {
h.SetCapacity(int64(minCnt))
} else if minCnt == 0 {
h.Exclude("out_of_quota")
}
return h.GetResult()