b230fb8ac4
The slice of strings more precisely captures the hierarchic nature of
the cgroup paths we use to represent pods and their groupings.
It also ensures we're reducing the chances of passing an incorrect path
format to a cgroup driver that requires a different path naming, since
now explicit conversions are always needed.
The new constructor NewCgroupName starts from an existing CgroupName,
which enforces a hierarchy where a root is always needed. It also
performs checking on the component names to ensure invalid characters
("/" and "_") are not in use.
A RootCgroupName for the top of the cgroup hierarchy tree is introduced.
This refactor results in a net reduction of around 30 lines of code,
mainly with the demise of ConvertCgroupNameToSystemd which had fairly
complicated logic in it and was doing just too many things.
There's a small TODO in a helper updateSystemdCgroupInfo that was
introduced to make this commit possible. That logic really belongs in
libcontainer, I'm planning to send a PR there to include it there.
(The API already takes a field with that information, only that field is
only processed in cgroupfs and not systemd driver, we should fix that.)
Tested by running the e2e-node tests on both Ubuntu 16.04 (with cgroupfs
driver) and CentOS 7 (with systemd driver.)
124 lines
3.3 KiB
Go
124 lines
3.3 KiB
Go
// +build linux
|
|
|
|
/*
|
|
Copyright 2016 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 (
|
|
"path"
|
|
"testing"
|
|
)
|
|
|
|
func TestCgroupNameToSystemdBasename(t *testing.T) {
|
|
testCases := []struct {
|
|
input CgroupName
|
|
expected string
|
|
}{
|
|
{
|
|
input: RootCgroupName,
|
|
expected: "/",
|
|
},
|
|
{
|
|
input: NewCgroupName(RootCgroupName, "system"),
|
|
expected: "system.slice",
|
|
},
|
|
{
|
|
input: NewCgroupName(RootCgroupName, "system", "Burstable"),
|
|
expected: "system-Burstable.slice",
|
|
},
|
|
{
|
|
input: NewCgroupName(RootCgroupName, "Burstable", "pod-123"),
|
|
expected: "Burstable-pod_123.slice",
|
|
},
|
|
{
|
|
input: NewCgroupName(RootCgroupName, "test", "a", "b"),
|
|
expected: "test-a-b.slice",
|
|
},
|
|
{
|
|
input: NewCgroupName(RootCgroupName, "test", "a", "b", "Burstable"),
|
|
expected: "test-a-b-Burstable.slice",
|
|
},
|
|
{
|
|
input: NewCgroupName(RootCgroupName, "Burstable"),
|
|
expected: "Burstable.slice",
|
|
},
|
|
{
|
|
input: NewCgroupName(RootCgroupName, "BestEffort", "pod-6c1a4e95-6bb6-11e6-bc26-28d2444e470d"),
|
|
expected: "BestEffort-pod_6c1a4e95_6bb6_11e6_bc26_28d2444e470d.slice",
|
|
},
|
|
}
|
|
for _, testCase := range testCases {
|
|
if actual := path.Base(testCase.input.ToSystemd()); actual != testCase.expected {
|
|
t.Errorf("Unexpected result, input: %v, expected: %v, actual: %v", testCase.input, testCase.expected, actual)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestCgroupNameToSystemd(t *testing.T) {
|
|
testCases := []struct {
|
|
input CgroupName
|
|
expected string
|
|
}{
|
|
{
|
|
input: RootCgroupName,
|
|
expected: "/",
|
|
},
|
|
{
|
|
input: NewCgroupName(RootCgroupName, "Burstable"),
|
|
expected: "/Burstable.slice",
|
|
},
|
|
{
|
|
input: NewCgroupName(RootCgroupName, "Burstable", "pod-123"),
|
|
expected: "/Burstable.slice/Burstable-pod_123.slice",
|
|
},
|
|
{
|
|
input: NewCgroupName(RootCgroupName, "BestEffort", "pod-6c1a4e95-6bb6-11e6-bc26-28d2444e470d"),
|
|
expected: "/BestEffort.slice/BestEffort-pod_6c1a4e95_6bb6_11e6_bc26_28d2444e470d.slice",
|
|
},
|
|
{
|
|
input: NewCgroupName(RootCgroupName, "kubepods"),
|
|
expected: "/kubepods.slice",
|
|
},
|
|
}
|
|
for _, testCase := range testCases {
|
|
if actual := testCase.input.ToSystemd(); actual != testCase.expected {
|
|
t.Errorf("Unexpected result, input: %v, expected: %v, actual: %v", testCase.input, testCase.expected, actual)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestCgroupNameToCgroupfs(t *testing.T) {
|
|
testCases := []struct {
|
|
input CgroupName
|
|
expected string
|
|
}{
|
|
{
|
|
input: RootCgroupName,
|
|
expected: "/",
|
|
},
|
|
{
|
|
input: NewCgroupName(RootCgroupName, "Burstable"),
|
|
expected: "/Burstable",
|
|
},
|
|
}
|
|
for _, testCase := range testCases {
|
|
if actual := testCase.input.ToCgroupfs(); actual != testCase.expected {
|
|
t.Errorf("Unexpected result, input: %v, expected: %v, actual: %v", testCase.input, testCase.expected, actual)
|
|
}
|
|
}
|
|
}
|