mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-12 09:46:25 +08:00
Kir Kolyshkin
e692886563
1. Dismantle and remove struct cgroupData. It contained three unrelated
entities (cgroup paths, pid, and resources), and made the code
harder to read. Most importantly, though, it is not needed.
Now, subsystems' Apply methods take path, resources, and pid.
To a reviewer -- the core of the changes is in fs.go and paths.go,
the rest of it is adapting to the new signatures and related test
changes.
2. Dismantle and remove struct cgroupTestUtil. This is a followup
to the previous item -- since cgroupData is gone, there is nothing
to hold in cgroupTestUtil. The change itself is very small (see
util_test.go), but this patch is big because of it -- mostly
because we had to replace helper.cgroup.Resources with
&config.Resources{}.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
110 lines
2.3 KiB
Go
110 lines
2.3 KiB
Go
package fs
|
|
|
|
import (
|
|
"strconv"
|
|
"testing"
|
|
|
|
"github.com/opencontainers/runc/libcontainer/cgroups"
|
|
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
|
|
"github.com/opencontainers/runc/libcontainer/configs"
|
|
)
|
|
|
|
const (
|
|
maxUnlimited = -1
|
|
maxLimited = 1024
|
|
)
|
|
|
|
func TestPidsSetMax(t *testing.T) {
|
|
path := tempDir(t, "pids")
|
|
|
|
writeFileContents(t, path, map[string]string{
|
|
"pids.max": "max",
|
|
})
|
|
|
|
r := &configs.Resources{
|
|
PidsLimit: maxLimited,
|
|
}
|
|
pids := &PidsGroup{}
|
|
if err := pids.Set(path, r); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
value, err := fscommon.GetCgroupParamUint(path, "pids.max")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if value != maxLimited {
|
|
t.Fatalf("Expected %d, got %d for setting pids.max - limited", maxLimited, value)
|
|
}
|
|
}
|
|
|
|
func TestPidsSetUnlimited(t *testing.T) {
|
|
path := tempDir(t, "pids")
|
|
|
|
writeFileContents(t, path, map[string]string{
|
|
"pids.max": strconv.Itoa(maxLimited),
|
|
})
|
|
|
|
r := &configs.Resources{
|
|
PidsLimit: maxUnlimited,
|
|
}
|
|
pids := &PidsGroup{}
|
|
if err := pids.Set(path, r); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
value, err := fscommon.GetCgroupParamString(path, "pids.max")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if value != "max" {
|
|
t.Fatalf("Expected %s, got %s for setting pids.max - unlimited", "max", value)
|
|
}
|
|
}
|
|
|
|
func TestPidsStats(t *testing.T) {
|
|
path := tempDir(t, "pids")
|
|
|
|
writeFileContents(t, path, map[string]string{
|
|
"pids.current": strconv.Itoa(1337),
|
|
"pids.max": strconv.Itoa(maxLimited),
|
|
})
|
|
|
|
pids := &PidsGroup{}
|
|
stats := *cgroups.NewStats()
|
|
if err := pids.GetStats(path, &stats); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if stats.PidsStats.Current != 1337 {
|
|
t.Fatalf("Expected %d, got %d for pids.current", 1337, stats.PidsStats.Current)
|
|
}
|
|
|
|
if stats.PidsStats.Limit != maxLimited {
|
|
t.Fatalf("Expected %d, got %d for pids.max", maxLimited, stats.PidsStats.Limit)
|
|
}
|
|
}
|
|
|
|
func TestPidsStatsUnlimited(t *testing.T) {
|
|
path := tempDir(t, "pids")
|
|
|
|
writeFileContents(t, path, map[string]string{
|
|
"pids.current": strconv.Itoa(4096),
|
|
"pids.max": "max",
|
|
})
|
|
|
|
pids := &PidsGroup{}
|
|
stats := *cgroups.NewStats()
|
|
if err := pids.GetStats(path, &stats); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if stats.PidsStats.Current != 4096 {
|
|
t.Fatalf("Expected %d, got %d for pids.current", 4096, stats.PidsStats.Current)
|
|
}
|
|
|
|
if stats.PidsStats.Limit != 0 {
|
|
t.Fatalf("Expected %d, got %d for pids.max", 0, stats.PidsStats.Limit)
|
|
}
|
|
}
|