Fix swap memory

boynux · boynux · commit 41afa949dacf · 2016-10-19T00:56:09.000+02:00
diff --git a/libcontainer/cgroups/fs/memory.go b/libcontainer/cgroups/fs/memory.go
@@ -98,7 +98,17 @@ func setKernelMemory(path string, kernelMemoryLimit int64) error {
 func setMemoryAndSwap(path string, cgroup *configs.Cgroup) error {
 	// When memory and swap memory are both set, we need to handle the cases
 	// for updating container.
-	if cgroup.Resources.Memory != 0 && cgroup.Resources.MemorySwap > 0 {
+
+  if cgroup.Resources.Memory == -1 {
+    if err := writeFile(path, "memory.memsw.limit_in_bytes", strconv.FormatInt(-1, 10)); err != nil {
+      return err
+    }
+    if err := writeFile(path, "memory.limit_in_bytes", strconv.FormatInt(cgroup.Resources.Memory, 10)); err != nil {
+      return err
+    }
+  }
+
+	if cgroup.Resources.Memory > 0 && cgroup.Resources.MemorySwap > 0 {
 		memoryUsage, err := getMemoryData(path, "")
 		if err != nil {
 			return err
@@ -123,7 +133,7 @@ func setMemoryAndSwap(path string, cgroup *configs.Cgroup) error {
 			}
 		}
 	} else {
-		if cgroup.Resources.Memory != 0 {
+		if cgroup.Resources.Memory > 0 {
 			if err := writeFile(path, "memory.limit_in_bytes", strconv.FormatInt(cgroup.Resources.Memory, 10)); err != nil {
 				return err
 			}
