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

Merge pull request #305 from hqhq/hq_add_softlimit_systemd 

Add memory reservation support for systemd
This commit is contained in:
Mrunal Patel 2015-10-05 16:37:32 -07:00
parent 223975564a fb5a56fb97
commit cc84f2cc9b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcontainer/cgroups/systemd/apply_systemd.go
View File

@ -177,7 +177,6 @@ func (m *Manager) Apply(pid int) error {
properties = append(properties,
newProp("MemoryLimit", uint64(c.Memory)))
}
// TODO: MemoryReservation and MemorySwap not available in systemd
if c.CpuShares != 0 {
properties = append(properties,
@ -213,6 +212,7 @@ func (m *Manager) Apply(pid int) error {
return err
}
// TODO: MemoryReservation and MemorySwap not available in systemd
if err := joinMemory(c, pid); err != nil {
return err
}
@ -510,6 +510,12 @@ func joinMemory(c *configs.Cgroup, pid int) error {
return err
}
}
if c.MemoryReservation > 0 {
err = writeFile(path, "memory.soft_limit_in_bytes", strconv.FormatInt(c.MemoryReservation, 10))
if err != nil {
return err
}
}
if c.OomKillDisable {
if err := writeFile(path, "memory.oom_control", "1"); err != nil {
return err