From d918e7f40817e4c2e22beade538bab1bd5edcc96 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sat, 19 Oct 2019 00:33:31 +0900 Subject: [PATCH] cpuset_v2: skip Apply when no limit is specified Signed-off-by: Akihiro Suda --- libcontainer/cgroups/fs/cpuset_v2.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libcontainer/cgroups/fs/cpuset_v2.go b/libcontainer/cgroups/fs/cpuset_v2.go index fa88cfb7..35c194be 100644 --- a/libcontainer/cgroups/fs/cpuset_v2.go +++ b/libcontainer/cgroups/fs/cpuset_v2.go @@ -22,11 +22,14 @@ func (s *CpusetGroupV2) Name() string { } func (s *CpusetGroupV2) Apply(d *cgroupData) error { + if d.config.Resources.CpusetCpus == "" && d.config.Resources.CpusetMems == "" { + return nil + } dir, err := d.path("cpuset") if err != nil && !cgroups.IsNotFound(err) { return err } - return s.ApplyDir(dir, d.config, d.pid) + return s.applyDir(dir, d.config, d.pid) } func (s *CpusetGroupV2) Set(path string, cgroup *configs.Cgroup) error { @@ -51,7 +54,7 @@ func (s *CpusetGroupV2) GetStats(path string, stats *cgroups.Stats) error { return nil } -func (s *CpusetGroupV2) ApplyDir(dir string, cgroup *configs.Cgroup, pid int) error { +func (s *CpusetGroupV2) applyDir(dir string, cgroup *configs.Cgroup, pid int) error { // This might happen if we have no cpuset cgroup mounted. // Just do nothing and don't fail. if dir == "" {