Merge pull request #70837 from kubernetes/revert-70605-affinity_lock_opt

Revert "Hold mutex lock shorter when processing inter-pod affinity/anti-affin…"

Merge pull request #70837 from kubernetes/revert-70605-affinity_lock_opt
ebaba20e · k8s-ci-robot · GitHub · 94bc005f · a2c09584 · ebaba20e
Unverified Commit ebaba20e authored Nov 09, 2018 by k8s-ci-robot Committed by GitHub Nov 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

interpod_affinity.go pkg/scheduler/algorithm/priorities/interpod_affinity.go +8 -6

No files found.
--- a/pkg/scheduler/algorithm/priorities/interpod_affinity.go
+++ b/pkg/scheduler/algorithm/priorities/interpod_affinity.go
@@ -92,13 +92,15 @@ func (p *podAffinityPriorityMap) processTerm(term *v1.PodAffinityTerm, podDefini
 	}
 	match := priorityutil.PodMatchesTermsNamespaceAndSelector(podToCheck, namespaces, selector)
 	if match {
-		for _, node := range p.nodes {
+		func() {
-			if priorityutil.NodesHaveSameTopologyKey(node, fixedNode, term.TopologyKey) {
+			p.Lock()
-				p.Lock()
+			defer p.Unlock()
-				p.counts[node.Name] += weight
+			for _, node := range p.nodes {
-				p.Unlock()
+				if priorityutil.NodesHaveSameTopologyKey(node, fixedNode, term.TopologyKey) {
+					p.counts[node.Name] += weight
+				}
 			}
-		}
+		}()
 	}
 }