github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #70678 from dashpole/fix_cgroup_manager

Browse Source 
Fix slice sharing bug in cgroup manager
This commit is contained in:
k8s-ci-robot 2018-11-07 11:36:41 -08:00 committed by GitHub
commit f1bf9bef5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/cm/cgroup_manager_linux.go
View File

@ -67,7 +67,10 @@ func NewCgroupName(base CgroupName, components ...string) CgroupName {
panic(fmt.Errorf("invalid character in component [%q] of CgroupName", component))
}
}
return CgroupName(append(base, components...))
// copy data from the base cgroup to eliminate cases where CgroupNames share underlying slices. See #68416
baseCopy := make([]string, len(base))
copy(baseCopy, base)
return CgroupName(append(baseCopy, components...))
}
func escapeSystemdCgroupName(part string) string {

25
pkg/kubelet/cm/cgroup_manager_linux_test.go
View File

@ -20,9 +20,34 @@ package cm
import (
"path"
"reflect"
"testing"
)
// TestNewCgroupName tests confirms that #68416 is fixed
func TestNewCgroupName(t *testing.T) {
a := ParseCgroupfsToCgroupName("/a/")
ab := NewCgroupName(a, "b")
expectedAB := CgroupName([]string{"a", "", "b"})
if !reflect.DeepEqual(ab, expectedAB) {
t.Errorf("Expected %d%+v; got %d%+v", len(expectedAB), expectedAB, len(ab), ab)
}
abc := NewCgroupName(ab, "c")
expectedABC := CgroupName([]string{"a", "", "b", "c"})
if !reflect.DeepEqual(abc, expectedABC) {
t.Errorf("Expected %d%+v; got %d%+v", len(expectedABC), expectedABC, len(abc), abc)
}
_ = NewCgroupName(ab, "d")
if !reflect.DeepEqual(abc, expectedABC) {
t.Errorf("Expected %d%+v; got %d%+v", len(expectedABC), expectedABC, len(abc), abc)
}
}
func TestCgroupNameToSystemdBasename(t *testing.T) {
testCases := []struct {
input CgroupName