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

scheduler: simplify findCandidatesThatFit()

Browse Source
This commit is contained in:
Yousong Zhou
2019-12-16 15:46:23 +00:00
parent 99e2a1a948
commit da68e7fccf
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/scheduler/core/generic_scheduler.go
View File

@@ -405,8 +405,8 @@ completed:
func findCandidatesThatFit(unit *Unit, candidates []Candidater, predicates map[string]FitPredicate) ([]Candidater, error) {
var filtered []Candidater
ok, err, newPredicates := preExecPredicate(unit, candidates, predicates)
if !ok {
newPredicates, err := preExecPredicate(unit, candidates, predicates)
if err != nil {
return nil, err
}
@@ -457,27 +457,20 @@ func findCandidatesThatFit(unit *Unit, candidates []Candidater, predicates map[s
return filtered, nil
}
func preExecPredicate(unit *Unit, candidates []Candidater, predicates map[string]FitPredicate) (bool, error, map[string]FitPredicate) {
var (
name string
predicate FitPredicate
ok bool
err error
newPredicateFuncs map[string]FitPredicate
)
newPredicateFuncs = make(map[string]FitPredicate)
for name, predicate = range predicates {
func preExecPredicate(unit *Unit, candidates []Candidater, predicates map[string]FitPredicate) (map[string]FitPredicate, error) {
newPredicateFuncs := map[string]FitPredicate{}
for name, predicate := range predicates {
// generate new FitPredicates because of race condition?
newPredicate := predicate.Clone()
ok, err = newPredicate.PreExecute(unit, candidates)
ok, err := newPredicate.PreExecute(unit, candidates)
if err != nil {
return nil, err
}
if ok {
newPredicateFuncs[name] = newPredicate
}
if err != nil {
return false, err, nil
}
}
return true, err, newPredicateFuncs
return newPredicateFuncs, nil
}
type WaitGroupWrapper struct {