github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #80018 from snowplayfire/fixnonode-for-predicate

Browse Source 
keep processing other nodes for the nil node error
This commit is contained in:
Kubernetes Prow Robot 2019-07-11 04:02:55 -07:00 committed by GitHub
commit 529255865d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/scheduler/algorithm/predicates/metadata.go
View File

@ -396,8 +396,7 @@ func getTPMapMatchingExistingAntiAffinity(pod *v1.Pod, nodeInfoMap map[string]*s
nodeInfo := nodeInfoMap[allNodeNames[i]] nodeInfo := nodeInfoMap[allNodeNames[i]]
node := nodeInfo.Node() node := nodeInfo.Node()
if node == nil { if node == nil {
catchError(fmt.Errorf("node %q not found", allNodeNames[i])) klog.Errorf("node %q not found", allNodeNames[i])
cancel()
return return
} }
for _, existingPod := range nodeInfo.PodsWithAffinity() { for _, existingPod := range nodeInfo.PodsWithAffinity() {
@ -465,8 +464,7 @@ func getTPMapMatchingIncomingAffinityAntiAffinity(pod *v1.Pod, nodeInfoMap map[s
nodeInfo := nodeInfoMap[allNodeNames[i]] nodeInfo := nodeInfoMap[allNodeNames[i]]
node := nodeInfo.Node() node := nodeInfo.Node()
if node == nil { if node == nil {
catchError(fmt.Errorf("node %q not found", allNodeNames[i])) klog.Errorf("node %q not found", allNodeNames[i])
cancel()
return return
} }
nodeTopologyPairsAffinityPodsMaps := newTopologyPairsMaps() nodeTopologyPairsAffinityPodsMaps := newTopologyPairsMaps()