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

Revert "Hold mutex lock shorter when processing inter-pod affinity/anti-affin…"
pull/58/head
k8s-ci-robot 2018-11-09 16:22:55 -08:00 committed by GitHub
commit ebaba20ed1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions

View File

@ -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
}
}
}
}()
}
}