7c760fea38
Previously, the state was keyed off of containerID intead of podUID and containerName. Unfortunately, this is no longer possible as we move to a to model where we we allocate CPUs to containers at pod adit time rather than container start time. This patch is the first step towards full migration to the new semantics. Only the unit tests in cpumanager/state are passing. In subsequent commits we will update the CPUManager itself to use these new semantics. This patch also includes code to do migration from the old checkpoint format to the new one, assuming the existence of a ContainerMap with the proper mapping of (containerID)->(podUID, containerName). A subsequent commit will update code in higher layers to make sure that this ContainerMap is made available to this state logic.
118 lines
3.0 KiB
Go
118 lines
3.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 state
|
|
|
|
import (
|
|
"sync"
|
|
|
|
"k8s.io/klog"
|
|
"k8s.io/kubernetes/pkg/kubelet/cm/cpuset"
|
|
)
|
|
|
|
type stateMemory struct {
|
|
sync.RWMutex
|
|
assignments ContainerCPUAssignments
|
|
defaultCPUSet cpuset.CPUSet
|
|
}
|
|
|
|
var _ State = &stateMemory{}
|
|
|
|
// NewMemoryState creates new State for keeping track of cpu/pod assignment
|
|
func NewMemoryState() State {
|
|
klog.Infof("[cpumanager] initializing new in-memory state store")
|
|
return &stateMemory{
|
|
assignments: ContainerCPUAssignments{},
|
|
defaultCPUSet: cpuset.NewCPUSet(),
|
|
}
|
|
}
|
|
|
|
func (s *stateMemory) GetCPUSet(podUID string, containerName string) (cpuset.CPUSet, bool) {
|
|
s.RLock()
|
|
defer s.RUnlock()
|
|
|
|
res, ok := s.assignments[podUID][containerName]
|
|
return res.Clone(), ok
|
|
}
|
|
|
|
func (s *stateMemory) GetDefaultCPUSet() cpuset.CPUSet {
|
|
s.RLock()
|
|
defer s.RUnlock()
|
|
|
|
return s.defaultCPUSet.Clone()
|
|
}
|
|
|
|
func (s *stateMemory) GetCPUSetOrDefault(podUID string, containerName string) cpuset.CPUSet {
|
|
if res, ok := s.GetCPUSet(podUID, containerName); ok {
|
|
return res
|
|
}
|
|
return s.GetDefaultCPUSet()
|
|
}
|
|
|
|
func (s *stateMemory) GetCPUAssignments() ContainerCPUAssignments {
|
|
s.RLock()
|
|
defer s.RUnlock()
|
|
return s.assignments.Clone()
|
|
}
|
|
|
|
func (s *stateMemory) SetCPUSet(podUID string, containerName string, cset cpuset.CPUSet) {
|
|
s.Lock()
|
|
defer s.Unlock()
|
|
|
|
if _, ok := s.assignments[podUID]; !ok {
|
|
s.assignments[podUID] = make(map[string]cpuset.CPUSet)
|
|
}
|
|
|
|
s.assignments[podUID][containerName] = cset
|
|
klog.Infof("[cpumanager] updated desired cpuset (pod: %s, container: %s, cpuset: \"%s\")", podUID, containerName, cset)
|
|
}
|
|
|
|
func (s *stateMemory) SetDefaultCPUSet(cset cpuset.CPUSet) {
|
|
s.Lock()
|
|
defer s.Unlock()
|
|
|
|
s.defaultCPUSet = cset
|
|
klog.Infof("[cpumanager] updated default cpuset: \"%s\"", cset)
|
|
}
|
|
|
|
func (s *stateMemory) SetCPUAssignments(a ContainerCPUAssignments) {
|
|
s.Lock()
|
|
defer s.Unlock()
|
|
|
|
s.assignments = a.Clone()
|
|
klog.Infof("[cpumanager] updated cpuset assignments: \"%v\"", a)
|
|
}
|
|
|
|
func (s *stateMemory) Delete(podUID string, containerName string) {
|
|
s.Lock()
|
|
defer s.Unlock()
|
|
|
|
delete(s.assignments[podUID], containerName)
|
|
if len(s.assignments[podUID]) == 0 {
|
|
delete(s.assignments, podUID)
|
|
}
|
|
klog.V(2).Infof("[cpumanager] deleted cpuset assignment (pod: %s, container: %s)", podUID, containerName)
|
|
}
|
|
|
|
func (s *stateMemory) ClearState() {
|
|
s.Lock()
|
|
defer s.Unlock()
|
|
|
|
s.defaultCPUSet = cpuset.CPUSet{}
|
|
s.assignments = make(ContainerCPUAssignments)
|
|
klog.V(2).Infof("[cpumanager] cleared state")
|
|
}
|