@@ -780,7 +780,6 @@ func getTPMapMatchingIncomingAffinityAntiAffinity(pod *v1.Pod, allNodes []*sched
780
780
return newTopologyPairsMaps (), newTopologyPairsMaps (), nil
781
781
}
782
782
783
- errCh := schedutil .NewErrorChannel ()
784
783
var lock sync.Mutex
785
784
topologyPairsAffinityPodsMaps = newTopologyPairsMaps ()
786
785
topologyPairsAntiAffinityPodsMaps = newTopologyPairsMaps ()
@@ -802,8 +801,10 @@ func getTPMapMatchingIncomingAffinityAntiAffinity(pod *v1.Pod, allNodes []*sched
802
801
}
803
802
804
803
antiAffinityTerms := GetPodAntiAffinityTerms (affinity .PodAntiAffinity )
805
-
806
- ctx , cancel := context .WithCancel (context .Background ())
804
+ antiAffinityProperties , err := getAffinityTermProperties (pod , antiAffinityTerms )
805
+ if err != nil {
806
+ return nil , nil , err
807
+ }
807
808
808
809
processNode := func (i int ) {
809
810
nodeInfo := allNodes [i ]
@@ -825,14 +826,9 @@ func getTPMapMatchingIncomingAffinityAntiAffinity(pod *v1.Pod, allNodes []*sched
825
826
}
826
827
}
827
828
// Check anti-affinity properties.
828
- for _ , term := range antiAffinityTerms {
829
- namespaces := priorityutil .GetNamespacesFromPodAffinityTerm (pod , & term )
830
- selector , err := metav1 .LabelSelectorAsSelector (term .LabelSelector )
831
- if err != nil {
832
- errCh .SendErrorWithCancel (err , cancel )
833
- return
834
- }
835
- if priorityutil .PodMatchesTermsNamespaceAndSelector (existingPod , namespaces , selector ) {
829
+ for i , term := range antiAffinityTerms {
830
+ p := antiAffinityProperties [i ]
831
+ if priorityutil .PodMatchesTermsNamespaceAndSelector (existingPod , p .namespaces , p .selector ) {
836
832
if topologyValue , ok := node .Labels [term .TopologyKey ]; ok {
837
833
pair := topologyPair {key : term .TopologyKey , value : topologyValue }
838
834
nodeTopologyPairsAntiAffinityPodsMaps .addTopologyPair (pair , existingPod )
@@ -845,11 +841,7 @@ func getTPMapMatchingIncomingAffinityAntiAffinity(pod *v1.Pod, allNodes []*sched
845
841
appendResult (node .Name , nodeTopologyPairsAffinityPodsMaps , nodeTopologyPairsAntiAffinityPodsMaps )
846
842
}
847
843
}
848
- workqueue .ParallelizeUntil (ctx , 16 , len (allNodes ), processNode )
849
-
850
- if err := errCh .ReceiveError (); err != nil {
851
- return nil , nil , err
852
- }
844
+ workqueue .ParallelizeUntil (context .Background (), 16 , len (allNodes ), processNode )
853
845
854
846
return topologyPairsAffinityPodsMaps , topologyPairsAntiAffinityPodsMaps , nil
855
847
}
0 commit comments