github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-21 01:50:55 +00:00
Code Issues Projects Releases Wiki Activity

Move filterSingleNumaHints call to top level Merge

Browse Source
This commit is contained in:
nolancon
2020-01-22 08:39:22 +00:00
parent 45660fd3a2
commit fc300e0e7d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/kubelet/cm/topologymanager/policy_single_numa_node.go
View File

@@ -76,9 +76,6 @@ func (p *singleNumaNodePolicy) mergeProvidersHints(filteredHints [][]TopologyHin
// of NUMA Nodes available on this machine. // of NUMA Nodes available on this machine.
defaultAffinity, _ := bitmask.NewBitMask(p.numaNodes...) defaultAffinity, _ := bitmask.NewBitMask(p.numaNodes...)
// Filter to only include don't cares and hints with a single NUMA node.
filteredHints = filterSingleNumaHints(filteredHints)
// Set the bestHint to return from this function as {nil false}. // Set the bestHint to return from this function as {nil false}.
// This will only be returned if no better hint can be found when // This will only be returned if no better hint can be found when
// merging hints from each hint provider. // merging hints from each hint provider.
@@ -128,7 +125,9 @@ func (p *singleNumaNodePolicy) mergeProvidersHints(filteredHints [][]TopologyHin
func (p *singleNumaNodePolicy) Merge(providersHints []map[string][]TopologyHint) (TopologyHint, lifecycle.PodAdmitResult) { func (p *singleNumaNodePolicy) Merge(providersHints []map[string][]TopologyHint) (TopologyHint, lifecycle.PodAdmitResult) {
filteredHints := filterProvidersHints(providersHints) filteredHints := filterProvidersHints(providersHints)
hint := p.mergeProvidersHints(filteredHints) // Filter to only include don't cares and hints with a single NUMA node.
singleNumaHints := filterSingleNumaHints(filteredHints)
hint := p.mergeProvidersHints(singleNumaHints)
admit := p.canAdmitPodResult(&hint) admit := p.canAdmitPodResult(&hint)
return hint, admit return hint, admit
} }