Remove support for MemoryReservation in systemd systems. This has been

deperecated since systemd 208.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
This commit is contained in:
Victor Marmol 2014-05-06 15:53:38 +00:00
parent 512bf6cd45
commit 93d8505fed

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,