jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2148 from AkihiroSuda/cg2-ignore-cpuset-when-no-config 

cgroup2: cpuset_v2: skip Apply when no limit is specified
This commit is contained in:
Qiang Huang 2019-10-29 21:57:58 +08:00 committed by GitHub
parent 03cf145f5a d918e7f408
commit d239ca8425
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libcontainer/cgroups/fs/cpuset_v2.go
View File

@ -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 == "" {