Skip to content

cgroup: Add support for memory.kmem.tcp.limit_in_bytes #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 15, 2015
Merged

cgroup: Add support for memory.kmem.tcp.limit_in_bytes #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions runtime-config-linux.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ The following parameters can be specified to setup the controller:

* **`kernel`** *(uint64, optional)* - sets hard limit for kernel memory

* **`kernelTCP`** *(uint64, optional)* - sets hard limit for kernel memory in tcp using
Copy link
Contributor

@wking wking Apr 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using… what? We still have this unfinished sentence in the current tip.

Copy link
Contributor

@vishh vishh Apr 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops.. @wking Can you post a PR to fix this ?

Copy link
Contributor

@wking wking Apr 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On Mon, Apr 11, 2016 at 03:54:09PM -0700, Vish Kannan wrote:

+* kernelTCP (uint64, optional) - sets hard limit for kernel memory in tcp using

Oops.. @wking Can you post a PR to fix this ?

@vbatts just pushed c1612af → d4e7326 in #370 which should cover this.

Copy link
Contributor

@wking wking Apr 11, 2016 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

@vbatts vbatts Apr 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i didn't address this comment

On Mon, Apr 11, 2016 at 6:59 PM, W. Trevor King [email protected]
wrote:

In runtime-config-linux.md
#235 (comment)
:

@@ -201,6 +201,8 @@ The following parameters can be specified to setup the controller:

  • kernel (uint64, optional) - sets hard limit for kernel memory

+* kernelTCP (uint64, optional) - sets hard limit for kernel memory in tcp using

On Mon, Apr 11, 2016 at 03:54:09PM -0700, Vish Kannan wrote: > +*
kernelTCP (uint64, optional) - sets hard limit for kernel memory in
tcp using Oops.. @wking https://github.com/wking Can you post a PR to
fix this ?
@vbatts https://github.com/vbatts just pushed c1612af
c1612af
→ d4e7326
d4e7326
in #370 #370 which
should cover this.

—
You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
https://github.com/opencontainers/runtime-spec/pull/235/files/e9a6d94848a3be8a65bc68c3b2c52639041504ed#r59296300


* **`swappiness`** *(uint64, optional)* - sets swappiness parameter of vmscan (See sysctl's vm.swappiness)

###### Example
Expand All @@ -211,6 +213,7 @@ The following parameters can be specified to setup the controller:
"reservation": 0,
"swap": 0,
"kernel": 0,
"kernelTCP": 0,
"swappiness": -1
}
```
Expand Down
2 changes: 2 additions & 0 deletions runtime_config_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ type Memory struct {
Swap uint64 `json:"swap"`
// Kernel memory limit (in bytes)
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
Swappiness uint64 `json:"swappiness"`
}
Expand Down