From fc300e0e7d675d0863e7f5e1158a2ff37e8f72b3 Mon Sep 17 00:00:00 2001 From: nolancon Date: Wed, 22 Jan 2020 08:39:22 +0000 Subject: [PATCH] Move filterSingleNumaHints call to top level Merge --- pkg/kubelet/cm/topologymanager/policy_single_numa_node.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/cm/topologymanager/policy_single_numa_node.go b/pkg/kubelet/cm/topologymanager/policy_single_numa_node.go index 239ae2bbbeb..da74c922691 100644 --- a/pkg/kubelet/cm/topologymanager/policy_single_numa_node.go +++ b/pkg/kubelet/cm/topologymanager/policy_single_numa_node.go @@ -76,9 +76,6 @@ func (p *singleNumaNodePolicy) mergeProvidersHints(filteredHints [][]TopologyHin // of NUMA Nodes available on this machine. 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}. // This will only be returned if no better hint can be found when // 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) { 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) return hint, admit }