Add memory swappiness support

- Initialize swappiness to -1 for the default config.json
- Pass swappiness from config.json to libcontainer config

Signed-off-by: Zefan Li <lizefan@huawei.com>
This commit is contained in:
Zefan Li 2015-07-14 10:28:21 +08:00
parent 31f23e4429
commit 6bd71ad6a4
2 changed files with 8 additions and 1 deletions

View File

@ -124,7 +124,8 @@ user named `daemon` defined within that file-system.
"limit": 0,
"reservation": 0,
"swap": 0,
"kernel": 0
"kernel": 0,
"swappiness": -1
},
"cpu": {
"shares": 0,

View File

@ -116,6 +116,11 @@ var specCommand = cli.Command{
"zero",
"urandom",
},
Resources: specs.Resources{
Memory: specs.Memory{
Swappiness: -1,
},
},
},
}
data, err := json.MarshalIndent(&spec, "", "\t")
@ -247,6 +252,7 @@ func createCgroupConfig(spec *specs.LinuxSpec, devices []*configs.Device) (*conf
c.MemoryReservation = r.Memory.Reservation
c.MemorySwap = r.Memory.Swap
c.KernelMemory = r.Memory.Kernel
c.MemorySwappiness = r.Memory.Swappiness
c.CpuShares = r.CPU.Shares
c.CpuQuota = r.CPU.Quota
c.CpuPeriod = r.CPU.Period