Merge pull request google#1423 from chenchun/memory_reservation

GetSpec missing memory reservation
danielkrainas · Aug 17, 2016 · 2ed7198 · 2ed7198
2 parents 6213bfa + 844c98e
commit 2ed7198
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/container/common/helpers.go b/container/common/helpers.go
@@ -110,6 +110,7 @@ func GetSpec(cgroupPaths map[string]string, machineInfoFactory info.MachineInfoF
 			spec.HasMemory = true
 			spec.Memory.Limit = readUInt64(memoryRoot, "memory.limit_in_bytes")
 			spec.Memory.SwapLimit = readUInt64(memoryRoot, "memory.memsw.limit_in_bytes")
+			spec.Memory.Reservation = readUInt64(memoryRoot, "memory.soft_limit_in_bytes")
 		}
 	}