github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup logging and creation logic of TopologyManager in prep for beta

Browse Source
This commit is contained in:
Kevin Klues 2020-02-02 18:36:01 +00:00
parent bc686ea27b
commit d5addb4090
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/kubelet/cm/topologymanager/topology_manager.go
View File

@ -124,7 +124,7 @@ func NewManager(numaNodeInfo cputopology.NUMANodeInfo, topologyPolicyName string
numaNodes = append(numaNodes, node) numaNodes = append(numaNodes, node)
} }
if len(numaNodes) > maxAllowableNUMANodes { if topologyPolicyName != PolicyNone && len(numaNodes) > maxAllowableNUMANodes {
return nil, fmt.Errorf("unsupported on machines with more than %v NUMA Nodes", maxAllowableNUMANodes) return nil, fmt.Errorf("unsupported on machines with more than %v NUMA Nodes", maxAllowableNUMANodes)
} }
@ -209,14 +209,12 @@ func (m *manager) RemoveContainer(containerID string) error {
} }
func (m *manager) Admit(attrs *lifecycle.PodAdmitAttributes) lifecycle.PodAdmitResult { func (m *manager) Admit(attrs *lifecycle.PodAdmitAttributes) lifecycle.PodAdmitResult {
klog.Infof("[topologymanager] Topology Admit Handler") // Unconditionally admit the pod if we are running with the 'none' policy.
if m.policy.Name() == "none" { if m.policy.Name() == PolicyNone {
klog.Infof("[topologymanager] Skipping calculate topology affinity as policy: none") return lifecycle.PodAdmitResult{Admit: true}
return lifecycle.PodAdmitResult{
Admit: true,
}
} }
klog.Infof("[topologymanager] Topology Admit Handler")
pod := attrs.Pod pod := attrs.Pod
hints := make(map[string]TopologyHint) hints := make(map[string]TopologyHint)
@ -235,7 +233,5 @@ func (m *manager) Admit(attrs *lifecycle.PodAdmitAttributes) lifecycle.PodAdmitR
m.podTopologyHints[string(pod.UID)] = hints m.podTopologyHints[string(pod.UID)] = hints
klog.Infof("[topologymanager] Topology Affinity for Pod: %v are %v", pod.UID, m.podTopologyHints[string(pod.UID)]) klog.Infof("[topologymanager] Topology Affinity for Pod: %v are %v", pod.UID, m.podTopologyHints[string(pod.UID)])
return lifecycle.PodAdmitResult{ return lifecycle.PodAdmitResult{Admit: true}
Admit: true,
}
} }