Merge pull request #94211 from soulxu/cleanup_candidates

Initialize candidate directly instead of iterating the array of candidates
This commit is contained in:
Kubernetes Prow Robot 2020-08-27 16:08:06 -07:00 committed by GitHub
commit 9062c43b76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -332,13 +332,15 @@ func SelectCandidate(candidates []Candidate) Candidate {
// Same as candidatesToVictimsMap, this logic is not applicable for out-of-tree // Same as candidatesToVictimsMap, this logic is not applicable for out-of-tree
// preemption plugins that exercise different candidates on the same nominated node. // preemption plugins that exercise different candidates on the same nominated node.
for _, candidate := range candidates { if victims := victimsMap[candidateNode]; victims != nil {
if candidateNode == candidate.Name() { return &candidate{
return candidate victims: victims,
name: candidateNode,
} }
} }
// We shouldn't reach here. // We shouldn't reach here.
klog.Errorf("None candidate can be picked from %v.", candidates) klog.Errorf("should not reach here, no candidate selected from %v.", candidates)
// To not break the whole flow, return the first candidate. // To not break the whole flow, return the first candidate.
return candidates[0] return candidates[0]
} }