jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #235 from yangdongsheng/kmem_tcp 

cgroup: Add support for memory.kmem.tcp.limit_in_bytes
This commit is contained in:
Vish Kannan 2015-12-14 21:39:53 -08:00
parent 772f073960 e9a6d94848
commit 56b88759a6
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
runtime-config-linux.md
View File

@ -201,6 +201,8 @@ The following parameters can be specified to setup the controller:
* **`kernel`** *(uint64, optional)* - sets hard limit for kernel memory * **`kernel`** *(uint64, optional)* - sets hard limit for kernel memory
* **`kernelTCP`** *(uint64, optional)* - sets hard limit for kernel memory in tcp using
* **`swappiness`** *(uint64, optional)* - sets swappiness parameter of vmscan (See sysctl's vm.swappiness) * **`swappiness`** *(uint64, optional)* - sets swappiness parameter of vmscan (See sysctl's vm.swappiness)
###### Example ###### Example
@ -211,6 +213,7 @@ The following parameters can be specified to setup the controller:
"reservation": 0, "reservation": 0,
"swap": 0, "swap": 0,
"kernel": 0, "kernel": 0,
"kernelTCP": 0,
"swappiness": -1 "swappiness": -1
} }
``` ```

2
runtime_config_linux.go
View File

@ -158,6 +158,8 @@ type Memory struct {
Swap uint64 `json:"swap"` Swap uint64 `json:"swap"`
// Kernel memory limit (in bytes) // Kernel memory limit (in bytes)
Kernel uint64 `json:"kernel"` Kernel uint64 `json:"kernel"`
// Kernel memory limit for tcp (in bytes)
KernelTCP uint64 `json:"kernelTCP"`
// How aggressive the kernel will swap memory pages. Range from 0 to 100. Set -1 to use system default // How aggressive the kernel will swap memory pages. Range from 0 to 100. Set -1 to use system default
Swappiness uint64 `json:"swappiness"` Swappiness uint64 `json:"swappiness"`
} }