lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-06-03 14:35:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

scheduler: fix random network domain not matched

Browse Source
This commit is contained in:
Zexi Li
2019-10-07 12:03:16 +08:00
parent ddea0bfd5a
commit b019ca3fc4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/scheduler/algorithm/predicates/network_predicate.go
View File

@@ -166,7 +166,7 @@ func (p *NetworkPredicate) Execute(u *core.Unit, c core.Candidater) (bool, []cor
netDomain := n.DomainId
reqDomain := domain
if netDomain != reqDomain {
appendError(FailReason{Reason: fmt.Sprintf("Network domain scope %s not owner by %s", netDomain, reqDomain), Type: NetworkDomain})
appendError(FailReason{Reason: fmt.Sprintf("Network %s domain scope %s not owner by %s", n.Name, netDomain, reqDomain), Type: NetworkDomain})
}
}
}
@@ -203,7 +203,7 @@ func (p *NetworkPredicate) Execute(u *core.Unit, c core.Candidater) (bool, []cor
filterByRandomNetwork := func() {
counters := core.NewCounters()
if errMsg := isRandomNetworkAvailable("", string(rbacutils.ScopeDomain), false, false, "", counters); len(errMsg) != 0 {
if errMsg := isRandomNetworkAvailable("", u.SchedData().Domain, false, false, "", counters); len(errMsg) != 0 {
h.ExcludeByErrors(errMsg)
}
h.SetCapacityCounter(counters)