Merge pull request #70605 from bsalamat/affinity_lock_opt

Hold mutex lock shorter when processing inter-pod affinity/anti-affin…
This commit is contained in:
k8s-ci-robot 2018-11-04 11:59:05 -08:00 committed by GitHub
commit 774b18491f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -92,15 +92,13 @@ func (p *podAffinityPriorityMap) processTerm(term *v1.PodAffinityTerm, podDefini
}
match := priorityutil.PodMatchesTermsNamespaceAndSelector(podToCheck, namespaces, selector)
if match {
func() {
p.Lock()
defer p.Unlock()
for _, node := range p.nodes {
if priorityutil.NodesHaveSameTopologyKey(node, fixedNode, term.TopologyKey) {
p.counts[node.Name] += weight
}
for _, node := range p.nodes {
if priorityutil.NodesHaveSameTopologyKey(node, fixedNode, term.TopologyKey) {
p.Lock()
p.counts[node.Name] += weight
p.Unlock()
}
}()
}
}
}