clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-04 12:41:42 +00:00
Code Issues Packages Projects Releases Wiki 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
parent d16fcc628e 69d43b2674
commit 7e3a1b6521
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cgroups/systemd/apply_systemd.go
+1 -5
View File
@@ -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,