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

Merge pull request #577 from crosbymichael/m-named-cgroup 

Move the process outside of the systemd cgroup
This commit is contained in:
Michael Crosby 2016-02-19 13:51:58 -08:00
parent 0107c7fb6c 47f16e89df
commit ee6a72df4e
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libcontainer/cgroups/fs/apply_raw.go
View File

@ -31,6 +31,7 @@ var (
&NetPrioGroup{}, &NetPrioGroup{},
&PerfEventGroup{}, &PerfEventGroup{},
&FreezerGroup{}, &FreezerGroup{},
&NameGroup{GroupName: "name=systemd", Join: true},
} }
CgroupProcesses = "cgroup.procs" CgroupProcesses = "cgroup.procs"
HugePageSizes, _ = cgroups.GetHugePageSize() HugePageSizes, _ = cgroups.GetHugePageSize()

8
libcontainer/cgroups/fs/name.go
View File

@ -9,6 +9,7 @@ import (
type NameGroup struct { type NameGroup struct {
GroupName string GroupName string
Join bool
} }
func (s *NameGroup) Name() string { func (s *NameGroup) Name() string {
@ -16,6 +17,10 @@ func (s *NameGroup) Name() string {
} }
func (s *NameGroup) Apply(d *cgroupData) error { func (s *NameGroup) Apply(d *cgroupData) error {
if s.Join {
// ignore errors if the named cgroup does not exist
d.join(s.GroupName)
}
return nil return nil
} }
@ -24,6 +29,9 @@ func (s *NameGroup) Set(path string, cgroup *configs.Cgroup) error {
} }
func (s *NameGroup) Remove(d *cgroupData) error { func (s *NameGroup) Remove(d *cgroupData) error {
if s.Join {
removePath(d.path(s.GroupName))
}
return nil return nil
} }