vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #5629 from vmarmol/fix-systemd-softlimit

Browse source 
Remove support for MemoryReservation in systemd systems.
This commit is contained in:
Michael Crosby 2014-05-06 09:48:33 -07:00
commit 44102c82aa
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cgroups/systemd/apply_systemd.go
View file

@ -146,11 +146,7 @@ func Apply(c *cgroups.Cgroup, pid int) (cgroups.ActiveCgroup, error) {
properties = append(properties, properties = append(properties,
systemd1.Property{"MemoryLimit", dbus.MakeVariant(uint64(c.Memory))}) systemd1.Property{"MemoryLimit", dbus.MakeVariant(uint64(c.Memory))})
} }
if c.MemoryReservation != 0 { // TODO: MemoryReservation and MemorySwap not available in systemd
properties = append(properties,
systemd1.Property{"MemorySoftLimit", dbus.MakeVariant(uint64(c.MemoryReservation))})
}
// TODO: MemorySwap not available in systemd
if c.CpuShares != 0 { if c.CpuShares != 0 {
properties = append(properties, properties = append(properties,