ab5870d808
The expectation is that exclusive CPU allocations happen at pod creation time. When a container restarts, it should not have its exclusive CPU allocations removed, and it should not need to re-allocate CPUs. There are a few places in the current code that look for containers that have exited and call CpuManager.RemoveContainer() to clean up the container. This will end up deleting any exclusive CPU allocations for that container, and if the container restarts within the same pod it will end up using the default cpuset rather than what should be exclusive CPUs. Removing those calls and adding resource cleanup at allocation time should get rid of the problem. Signed-off-by: Chris Friesen <chris.friesen@windriver.com>
69 lines
2.0 KiB
Go
69 lines
2.0 KiB
Go
/*
|
|
Copyright 2017 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 cm
|
|
|
|
import (
|
|
"k8s.io/api/core/v1"
|
|
|
|
utilfeature "k8s.io/apiserver/pkg/util/feature"
|
|
kubefeatures "k8s.io/kubernetes/pkg/features"
|
|
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager"
|
|
"k8s.io/kubernetes/pkg/kubelet/cm/topologymanager"
|
|
)
|
|
|
|
type InternalContainerLifecycle interface {
|
|
PreStartContainer(pod *v1.Pod, container *v1.Container, containerID string) error
|
|
PreStopContainer(containerID string) error
|
|
PostStopContainer(containerID string) error
|
|
}
|
|
|
|
// Implements InternalContainerLifecycle interface.
|
|
type internalContainerLifecycleImpl struct {
|
|
cpuManager cpumanager.Manager
|
|
topologyManager topologymanager.Manager
|
|
}
|
|
|
|
func (i *internalContainerLifecycleImpl) PreStartContainer(pod *v1.Pod, container *v1.Container, containerID string) error {
|
|
if i.cpuManager != nil {
|
|
err := i.cpuManager.AddContainer(pod, container, containerID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.TopologyManager) {
|
|
err := i.topologyManager.AddContainer(pod, containerID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (i *internalContainerLifecycleImpl) PreStopContainer(containerID string) error {
|
|
return nil
|
|
}
|
|
|
|
func (i *internalContainerLifecycleImpl) PostStopContainer(containerID string) error {
|
|
if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.TopologyManager) {
|
|
err := i.topologyManager.RemoveContainer(containerID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|