mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-06 10:43:56 +00:00
Add new functionality for single-numa-node policy:
Explanation taken from original commit: - Change the current method of finding the best hint. Instead of going over all permutations, sort the hints and find the narrowest hint common to all resources. - Break out early when merging to a preferred hint is not possible
This commit is contained in:
parent
5ce2ea2773
commit
2825a7be1a
@ -17,8 +17,10 @@ limitations under the License.
|
|||||||
package topologymanager
|
package topologymanager
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"k8s.io/klog"
|
||||||
"k8s.io/kubernetes/pkg/kubelet/cm/topologymanager/bitmask"
|
"k8s.io/kubernetes/pkg/kubelet/cm/topologymanager/bitmask"
|
||||||
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
|
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
|
||||||
|
"sort"
|
||||||
)
|
)
|
||||||
|
|
||||||
type singleNumaNodePolicy struct {
|
type singleNumaNodePolicy struct {
|
||||||
@ -53,12 +55,134 @@ func (p *singleNumaNodePolicy) canAdmitPodResult(hint *TopologyHint) lifecycle.P
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Get the narrowest hint aligned to one NUMA node
|
||||||
|
// assumption: allResourcesHints are not empty, all hints have NUMAAffinity != nil,
|
||||||
|
// all hints have exactly one NUMA node set in NUMANodeAffinity
|
||||||
|
func (p *singleNumaNodePolicy) getHintMatch(allResourcesHints [][]TopologyHint) (bool, TopologyHint) {
|
||||||
|
// Sort all resources hints
|
||||||
|
for _, resource := range allResourcesHints {
|
||||||
|
sort.Slice(resource, func(i, j int) bool {
|
||||||
|
if resource[i].NUMANodeAffinity.GetBits()[0] < resource[j].NUMANodeAffinity.GetBits()[0] {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
})
|
||||||
|
|
||||||
|
}
|
||||||
|
// find a match by searching a hint of one resource in the rest
|
||||||
|
var match TopologyHint
|
||||||
|
var foundMatch bool
|
||||||
|
|
||||||
|
if len(allResourcesHints) == 1 {
|
||||||
|
match = allResourcesHints[0][0]
|
||||||
|
match.Preferred = true
|
||||||
|
return true, match
|
||||||
|
}
|
||||||
|
for _, candidate := range allResourcesHints[0] {
|
||||||
|
foundMatch = true
|
||||||
|
for _, hints := range allResourcesHints[1:] {
|
||||||
|
res := sort.Search(len(hints), func(i int) bool {
|
||||||
|
return hints[i].NUMANodeAffinity.GetBits()[0] >= candidate.NUMANodeAffinity.GetBits()[0]
|
||||||
|
})
|
||||||
|
if res >= len(hints) ||
|
||||||
|
!hints[res].NUMANodeAffinity.IsEqual(candidate.NUMANodeAffinity) {
|
||||||
|
// hint not found, move to next hint from allResourcesHints[0]
|
||||||
|
foundMatch = false
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if foundMatch {
|
||||||
|
match = candidate
|
||||||
|
match.Preferred = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return foundMatch, match
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return hints that have valid bitmasks with exactly one bit set
|
||||||
|
func (p *singleNumaNodePolicy) filterHints(allResourcesHints [][]TopologyHint) [][]TopologyHint {
|
||||||
|
var filteredResourcesHints [][]TopologyHint
|
||||||
|
if len(allResourcesHints) > 0 {
|
||||||
|
for _, oneResourceHints := range allResourcesHints {
|
||||||
|
var filtered []TopologyHint
|
||||||
|
if len(oneResourceHints) > 0 {
|
||||||
|
for _, hint := range oneResourceHints {
|
||||||
|
if hint.NUMANodeAffinity != nil && hint.NUMANodeAffinity.Count() == 1 {
|
||||||
|
filtered = append(filtered, hint)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
filteredResourcesHints = append(filteredResourcesHints, filtered)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return filteredResourcesHints
|
||||||
|
}
|
||||||
|
|
||||||
func (p *singleNumaNodePolicy) mergeProvidersHints(providersHints []map[string][]TopologyHint) TopologyHint {
|
func (p *singleNumaNodePolicy) mergeProvidersHints(providersHints []map[string][]TopologyHint) TopologyHint {
|
||||||
// Set the default hint to return from this function as an any-NUMANode
|
// Set the default hint to return from this function as an any-NUMANode
|
||||||
// affinity with an unpreferred allocation. This will only be returned if
|
// affinity with an unpreferred allocation. This will only be returned if
|
||||||
// no better hint can be found when merging hints from each hint provider.
|
// no better hint can be found when merging hints from each hint provider.
|
||||||
defaultAffinity, _ := bitmask.NewBitMask(p.numaNodes...)
|
defaultAffinity, _ := bitmask.NewBitMask(p.numaNodes...)
|
||||||
defaultHint := TopologyHint{defaultAffinity, false}
|
defaultHint := TopologyHint{defaultAffinity, false}
|
||||||
|
|
||||||
|
// Loop through all provider hints and save an accumulated list of the
|
||||||
|
// hints returned by each hint provider. If no hints are provided, assume
|
||||||
|
// that provider has no preference for topology-aware allocation.
|
||||||
|
var allResourcesHints [][]TopologyHint
|
||||||
|
for _, hints := range providersHints {
|
||||||
|
if len(hints) == 0 {
|
||||||
|
klog.Infof("[topologymanager] Hint Provider has no preference for NUMA affinity with any resource, " +
|
||||||
|
"skipping.")
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// Otherwise, accumulate the hints for each resource type into allProviderHints.
|
||||||
|
for resource := range hints {
|
||||||
|
if hints[resource] == nil {
|
||||||
|
klog.Infof("[topologymanager] Hint Provider has no preference for NUMA affinity with resource "+
|
||||||
|
"'%s', skipping.", resource)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(hints[resource]) == 0 {
|
||||||
|
klog.Infof("[topologymanager] Hint Provider has no possible NUMA affinities for resource '%s'",
|
||||||
|
resource)
|
||||||
|
// return defaultHint which will fail pod admission
|
||||||
|
return defaultHint
|
||||||
|
}
|
||||||
|
klog.Infof("[topologymanager] TopologyHints for resource '%v': %v", resource, hints[resource])
|
||||||
|
allResourcesHints = append(allResourcesHints, hints[resource])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// In case allProviderHints length is zero it means that we have no
|
||||||
|
// preference for NUMA affinity. In that case update default hint preferred
|
||||||
|
// to true to allow scheduling.
|
||||||
|
if len(allResourcesHints) == 0 {
|
||||||
|
klog.Infof("[topologymanager] No preference for NUMA affinity from all providers")
|
||||||
|
defaultHint.Preferred = true
|
||||||
|
return defaultHint
|
||||||
|
}
|
||||||
|
|
||||||
|
allResourcesHints = p.filterHints(allResourcesHints)
|
||||||
|
// if no hints or there is a resource with empty hints after filtering, then policy cannot be satisfied
|
||||||
|
if len(allResourcesHints) == 0 {
|
||||||
|
klog.Infof("[topologymanager] No hints that align to a single NUMA node.")
|
||||||
|
return defaultHint
|
||||||
|
}
|
||||||
|
for _, hints := range allResourcesHints {
|
||||||
|
if len(hints) == 0 {
|
||||||
|
klog.Infof("[topologymanager] No hints that align to a single NUMA node for resource.")
|
||||||
|
return defaultHint
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
found, match := p.getHintMatch(allResourcesHints)
|
||||||
|
if found {
|
||||||
|
klog.Infof("[topologymanager] single-numa-node policy match: %v", match)
|
||||||
|
return match
|
||||||
|
}
|
||||||
|
klog.Infof("[topologymanager] single-numa-node no match: %v", defaultHint)
|
||||||
return defaultHint
|
return defaultHint
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user