From a2c0958428b32577539830be19572626803bfd20 Mon Sep 17 00:00:00 2001 From: "Babak \"Bobby\" Salamat" Date: Thu, 8 Nov 2018 18:26:26 -0800 Subject: [PATCH] =?UTF-8?q?Revert=20"Hold=20mutex=20lock=20shorter=20when?= =?UTF-8?q?=20processing=20inter-pod=20affinity/anti-affin=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../algorithm/priorities/interpod_affinity.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkg/scheduler/algorithm/priorities/interpod_affinity.go b/pkg/scheduler/algorithm/priorities/interpod_affinity.go index 7b3246e56d1..7e640566c82 100644 --- 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 { - if priorityutil.NodesHaveSameTopologyKey(node, fixedNode, term.TopologyKey) { - p.Lock() - p.counts[node.Name] += weight - p.Unlock() + func() { + p.Lock() + defer p.Unlock() + for _, node := range p.nodes { + if priorityutil.NodesHaveSameTopologyKey(node, fixedNode, term.TopologyKey) { + p.counts[node.Name] += weight + } } - } + }() } }