mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-11-23 01:45:12 +00:00
c025861e0c
In order to improve the observability of the resource management in kubelet, cpu allocation and NUMA alignment, we add more metrics to report if resource alignment is in effect. The more precise reporting would probably be using pod status, but this would require more invasive and riskier changes, and possibly extra interactions to the APIServer. We start adding metrics to report if containers got their compute resources aligned. If metrics are growing, the assingment is working as expected; If metrics stay consistent, perhaps at zero, no resource alignment is done. Extra fixes brought by this work - retroactively add labels for existing tests - running metrics test demands precision accounting to avoid flakes; ensure the node state is restored pristine between each test, to minimize the aforementioned risk of flakes. - The test pod command line was wrong, with this the pod could not reach Running state. That gone unnoticed so far because no test using this utility function actually needed a pod in running state. Signed-off-by: Francesco Romani <fromani@redhat.com>
90 lines
2.8 KiB
Go
90 lines
2.8 KiB
Go
/*
|
|
Copyright 2020 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package topologymanager
|
|
|
|
import (
|
|
"k8s.io/api/core/v1"
|
|
"k8s.io/klog/v2"
|
|
"k8s.io/kubernetes/pkg/kubelet/cm/admission"
|
|
"k8s.io/kubernetes/pkg/kubelet/cm/containermap"
|
|
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
|
|
"k8s.io/kubernetes/pkg/kubelet/metrics"
|
|
)
|
|
|
|
type podScope struct {
|
|
scope
|
|
}
|
|
|
|
// Ensure podScope implements Scope interface
|
|
var _ Scope = &podScope{}
|
|
|
|
// NewPodScope returns a pod scope.
|
|
func NewPodScope(policy Policy) Scope {
|
|
return &podScope{
|
|
scope{
|
|
name: podTopologyScope,
|
|
podTopologyHints: podTopologyHints{},
|
|
policy: policy,
|
|
podMap: containermap.NewContainerMap(),
|
|
},
|
|
}
|
|
}
|
|
|
|
func (s *podScope) Admit(pod *v1.Pod) lifecycle.PodAdmitResult {
|
|
bestHint, admit := s.calculateAffinity(pod)
|
|
klog.InfoS("Best TopologyHint", "bestHint", bestHint, "pod", klog.KObj(pod))
|
|
if !admit {
|
|
metrics.TopologyManagerAdmissionErrorsTotal.Inc()
|
|
return admission.GetPodAdmitResult(&TopologyAffinityError{})
|
|
}
|
|
|
|
for _, container := range append(pod.Spec.InitContainers, pod.Spec.Containers...) {
|
|
klog.InfoS("Topology Affinity", "bestHint", bestHint, "pod", klog.KObj(pod), "containerName", container.Name)
|
|
s.setTopologyHints(string(pod.UID), container.Name, bestHint)
|
|
|
|
err := s.allocateAlignedResources(pod, &container)
|
|
if err != nil {
|
|
metrics.TopologyManagerAdmissionErrorsTotal.Inc()
|
|
return admission.GetPodAdmitResult(err)
|
|
}
|
|
}
|
|
if IsAlignmentGuaranteed(s.policy) {
|
|
// increment only if we know we allocate aligned resources.
|
|
metrics.ContainerAlignedComputeResources.WithLabelValues(metrics.AlignScopePod, metrics.AlignedNUMANode).Inc()
|
|
}
|
|
return admission.GetPodAdmitResult(nil)
|
|
}
|
|
|
|
func (s *podScope) accumulateProvidersHints(pod *v1.Pod) []map[string][]TopologyHint {
|
|
var providersHints []map[string][]TopologyHint
|
|
|
|
for _, provider := range s.hintProviders {
|
|
// Get the TopologyHints for a Pod from a provider.
|
|
hints := provider.GetPodTopologyHints(pod)
|
|
providersHints = append(providersHints, hints)
|
|
klog.InfoS("TopologyHints", "hints", hints, "pod", klog.KObj(pod))
|
|
}
|
|
return providersHints
|
|
}
|
|
|
|
func (s *podScope) calculateAffinity(pod *v1.Pod) (TopologyHint, bool) {
|
|
providersHints := s.accumulateProvidersHints(pod)
|
|
bestHint, admit := s.policy.Merge(providersHints)
|
|
klog.InfoS("PodTopologyHint", "bestHint", bestHint)
|
|
return bestHint, admit
|
|
}
|