mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20 from estesp/fix-memory-swappiness-init

Browse Source 
Initialize memory.swappiness cgroup to -1
This commit is contained in:
Mrunal Patel
2015-06-23 16:17:10 -07:00
parent f74baf28f9 9c732ae501
commit dc185c6e67
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec_linux.go
+7 -6
View File
@@ -186,12 +186,13 @@ func createCgroupConfig(spec *LinuxSpec, devices []*configs.Device) (*configs.Cg
return nil, err
}
c := &configs.Cgroup{
Name: getDefaultID(),
Parent: myCgroupPath,
AllowedDevices: append(devices, allowedDevices...),
CpuQuota: getCPUQuota(spec.Cpus),
Memory: spec.Memory * 1024 * 1024,
MemorySwap: -1,
Name: getDefaultID(),
Parent: myCgroupPath,
AllowedDevices: append(devices, allowedDevices...),
CpuQuota: getCPUQuota(spec.Cpus),
Memory: spec.Memory * 1024 * 1024,
MemorySwap: -1,
MemorySwappiness: -1,
}
if r := spec.Resources; r != nil {
c.MemoryReservation = r.MemoryReservation