github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Update CPUmanager containerMap to allow removal by containerRef

Browse Source
This commit is contained in:
Kevin Klues 2019-11-05 19:48:24 +00:00
parent 0639bd0942
commit 1d995c98ef
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubelet/cm/cpumanager/containermap/container_map.go
View File

@ -39,11 +39,19 @@ func (cm ContainerMap) Add(podUID, containerName, containerID string) {
}{podUID, containerName} }{podUID, containerName}
} }
// Remove removes a mapping of (containerID)->(*v1.Pod, *.v1.Container) from the ContainerMap // RemoveByContainerID removes a mapping of (containerID)->(podUID, containerName) from the ContainerMap
func (cm ContainerMap) Remove(containerID string) { func (cm ContainerMap) RemoveByContainerID(containerID string) {
delete(cm, containerID) delete(cm, containerID)
} }
// RemoveByContainerRef removes a mapping of (containerID)->(podUID, containerName) from the ContainerMap
func (cm ContainerMap) RemoveByContainerRef(podUID, containerName string) {
containerID, err := cm.GetContainerID(podUID, containerName)
if err == nil {
cm.RemoveByContainerID(containerID)
}
}
// GetContainerID retrieves a ContainerID from the ContainerMap // GetContainerID retrieves a ContainerID from the ContainerMap
func (cm ContainerMap) GetContainerID(podUID, containerName string) (string, error) { func (cm ContainerMap) GetContainerID(podUID, containerName string) (string, error) {
for key, val := range cm { for key, val := range cm {

10
pkg/kubelet/cm/cpumanager/containermap/container_map_test.go
View File

@ -63,11 +63,19 @@ func TestContainerMap(t *testing.T) {
// Remove all entries from the containerMap, checking proper removal of // Remove all entries from the containerMap, checking proper removal of
// each along the way. // each along the way.
for i := range tc.containerNames { for i := range tc.containerNames {
cm.Remove(tc.containerIDs[i]) cm.RemoveByContainerID(tc.containerIDs[i])
containerID, err := cm.GetContainerID(tc.podUID, tc.containerNames[i]) containerID, err := cm.GetContainerID(tc.podUID, tc.containerNames[i])
if err == nil { if err == nil {
t.Errorf("unexpected retrieval of containerID after removal: %v", containerID) t.Errorf("unexpected retrieval of containerID after removal: %v", containerID)
} }
cm.Add(tc.podUID, tc.containerNames[i], tc.containerIDs[i])
cm.RemoveByContainerRef(tc.podUID, tc.containerNames[i])
podUID, containerName, err := cm.GetContainerRef(tc.containerIDs[i])
if err == nil {
t.Errorf("unexpected retrieval of container reference after removal: (%v, %v)", podUID, containerName)
}
} }
// Verify containerMap now empty. // Verify containerMap now empty.

2
pkg/kubelet/cm/cpumanager/policy_static.go
View File

@ -243,7 +243,7 @@ func (p *staticPolicy) RemoveContainer(s state.State, containerID string) (rerr
// remove containerID from the containerMap. // remove containerID from the containerMap.
defer func() { defer func() {
if rerr == nil { if rerr == nil {
p.containerMap.Remove(containerID) p.containerMap.RemoveByContainerID(containerID)
} }
}() }()