github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 23:15:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94211 from soulxu/cleanup_candidates

Browse Source 
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
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go
View File

@ -332,13 +332,15 @@ func SelectCandidate(candidates []Candidate) Candidate {
// Same as candidatesToVictimsMap, this logic is not applicable for out-of-tree
// preemption plugins that exercise different candidates on the same nominated node.
for _, candidate := range candidates {
if candidateNode == candidate.Name() {
return candidate
if victims := victimsMap[candidateNode]; victims != nil {
return &candidate{
victims: victims,
name: candidateNode,
}
}
// 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.
return candidates[0]
}