Skip to content

Commit

Permalink
Merge pull request #2148 from AkihiroSuda/cg2-ignore-cpuset-when-no-c…
Browse files Browse the repository at this point in the history
…onfig

cgroup2: cpuset_v2: skip Apply when no limit is specified
  • Loading branch information
hqhq authored Oct 29, 2019
2 parents 03cf145 + d918e7f commit d239ca8
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions libcontainer/cgroups/fs/cpuset_v2.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 == "" {
Expand Down

0 comments on commit d239ca8

Please sign in to comment.