File tree Expand file tree Collapse file tree 1 file changed +3
-4
lines changed
pkg/kubelet/cm/topologymanager Expand file tree Collapse file tree 1 file changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -76,9 +76,6 @@ func (p *singleNumaNodePolicy) mergeProvidersHints(filteredHints [][]TopologyHin
76
76
// of NUMA Nodes available on this machine.
77
77
defaultAffinity , _ := bitmask .NewBitMask (p .numaNodes ... )
78
78
79
- // Filter to only include don't cares and hints with a single NUMA node.
80
- filteredHints = filterSingleNumaHints (filteredHints )
81
-
82
79
// Set the bestHint to return from this function as {nil false}.
83
80
// This will only be returned if no better hint can be found when
84
81
// merging hints from each hint provider.
@@ -128,7 +125,9 @@ func (p *singleNumaNodePolicy) mergeProvidersHints(filteredHints [][]TopologyHin
128
125
129
126
func (p * singleNumaNodePolicy ) Merge (providersHints []map [string ][]TopologyHint ) (TopologyHint , lifecycle.PodAdmitResult ) {
130
127
filteredHints := filterProvidersHints (providersHints )
131
- hint := p .mergeProvidersHints (filteredHints )
128
+ // Filter to only include don't cares and hints with a single NUMA node.
129
+ singleNumaHints := filterSingleNumaHints (filteredHints )
130
+ hint := p .mergeProvidersHints (singleNumaHints )
132
131
admit := p .canAdmitPodResult (& hint )
133
132
return hint , admit
134
133
}
You can’t perform that action at this time.
0 commit comments