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

fix: scheduler network predicate not set capability when host filtered (#279)

Browse Source
This commit is contained in:
Zexi Li
2019-04-08 22:35:41 +08:00
committed by yunion-ci-robot
parent a7a672bf6c
commit 886c66bc67
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduler/algorithm/predicates/baremetal/network_predicate.go
+2 -2
View File
@@ -109,7 +109,7 @@ func (p *NetworkPredicate) Execute(u *core.Unit, c core.Candidater) (bool, []cor
filterByRandomNetwork := func() {
if err_msg := isRandomNetworkAvailable(false, false, ""); err_msg != "" {
h.AppendPredicateFailMsg(err_msg)
h.Exclude(err_msg)
}
h.SetCapacityCounter(counters)
}
@@ -138,7 +138,7 @@ func (p *NetworkPredicate) Execute(u *core.Unit, c core.Candidater) (bool, []cor
}
if len(errMsgs) > 0 {
h.AppendPredicateFailMsg(strings.Join(errMsgs, ", "))
h.Exclude(strings.Join(errMsgs, ", "))
}
}
pkg/scheduler/algorithm/predicates/guest/network_predicate.go
+2 -2
View File
@@ -140,7 +140,7 @@ func (p *NetworkPredicate) Execute(u *core.Unit, c core.Candidater) (bool, []cor
filterByRandomNetwork := func() {
counters := core.NewCounters()
if err_msg := isRandomNetworkAvailable(false, false, "", counters); err_msg != "" {
h.AppendPredicateFailMsg(err_msg)
h.Exclude(err_msg)
}
h.SetCapacityCounter(counters)
}
@@ -202,7 +202,7 @@ func (p *NetworkPredicate) Execute(u *core.Unit, c core.Candidater) (bool, []cor
}
if len(errMsgs) > 0 {
h.AppendPredicateFailMsg(strings.Join(errMsgs, ", "))
h.Exclude(strings.Join(errMsgs, ", "))
} else {
h.SetCapacityCounter(counters)
}