From 69d43b2674aa8ed69c641556cae68d405505a45b Mon Sep 17 00:00:00 2001 From: Victor Marmol Date: Tue, 6 May 2014 15:53:38 +0000 Subject: [PATCH] Remove support for MemoryReservation in systemd systems. This has been deperecated since systemd 208. Docker-DCO-1.1-Signed-off-by: Victor Marmol (github: vmarmol) --- pkg/cgroups/systemd/apply_systemd.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkg/cgroups/systemd/apply_systemd.go b/pkg/cgroups/systemd/apply_systemd.go index 12dede9581..c4b0937b63 100644 --- a/pkg/cgroups/systemd/apply_systemd.go +++ b/pkg/cgroups/systemd/apply_systemd.go @@ -146,11 +146,7 @@ func Apply(c *cgroups.Cgroup, pid int) (cgroups.ActiveCgroup, error) { properties = append(properties, systemd1.Property{"MemoryLimit", dbus.MakeVariant(uint64(c.Memory))}) } - if c.MemoryReservation != 0 { - properties = append(properties, - systemd1.Property{"MemorySoftLimit", dbus.MakeVariant(uint64(c.MemoryReservation))}) - } - // TODO: MemorySwap not available in systemd + // TODO: MemoryReservation and MemorySwap not available in systemd if c.CpuShares != 0 { properties = append(properties,