-
Notifications
You must be signed in to change notification settings - Fork 623
add pid limits #2415
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.
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
add pid limits #2415
Conversation
Please sign your commits following these rules: $ git clone -b "master" git@github.com:cheyang/swarmkit.git somewhere
$ cd somewhere
$ git commit --amend -s --no-edit
$ git push -f Amending updates the existing PR. You DO NOT need to open a new one. |
Codecov Report
@@ Coverage Diff @@
## master #2415 +/- ##
==========================================
- Coverage 66.14% 60.54% -5.6%
==========================================
Files 80 128 +48
Lines 14652 26362 +11710
==========================================
+ Hits 9691 15962 +6271
- Misses 4168 9004 +4836
- Partials 793 1396 +603 |
@dperny Please take a look, thanks. |
LGTM, but will require a change in moby/moby to take advantage of this field as well. @aluzzardi this is a quick review, mind taking a look? |
api/specs.proto
Outdated
@@ -314,6 +314,8 @@ message ContainerSpec { | |||
// Isolation defines the isolation level for windows containers (default, process, hyperv). | |||
// Runtimes that don't support it ignore that field | |||
Isolation isolation = 24; | |||
|
|||
int64 pidsLimit = 25; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add a comment to specify the motivation, intended usage etc.
|
||
hostConfig := c.hostConfig() | ||
expected := int64(10) | ||
// actual := hostConfig.Resources.PidsLimit |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove this comment ?
Signed-off-by: cheyang <cheyang@163.com>
@anshulpundir I have already updated per your suggestions. Thanks. |
@dperny I will create another PR to moby/moby after this change is merged. Thanks. |
@cheyang merged, you can open the moby PR now. thanks! |
Thanks, I will open moby PR soon. |
Upgrade swarmkit dependency. Changes: moby/swarmkit@ce5f7b8a (HEAD -> master, origin/master, origin/HEAD) Merge pull request moby/swarmkit#2411 from crunchywelch/2401-arm64_support moby/swarmkit@b0856099 Merge pull request moby/swarmkit#2423 from thaJeztah/new-misty-handle moby/swarmkit@2bd294fc Update Misty's GitHub handle moby/swarmkit@0769c605 Comments for orphaned state/task reaper. (moby/swarmkit#2421) moby/swarmkit@de950a7e Generic resource cli (moby/swarmkit#2347) moby/swarmkit@312be598 Provide custom gRPC dialer to override default 8000 proxy dialer (moby/swarmkit#2419) moby/swarmkit@4f12bf79 Merge pull request moby/swarmkit#2415 from cheyang/master moby/swarmkit@8f9f7dc1 add pid limits moby/swarmkit@da5ee2a6 Merge pull request moby/swarmkit#2409 from dperny/workaround-attachments moby/swarmkit@0c7b2fc2 Delete node attachments when node is removed moby/swarmkit@9d702763 normalize "aarch64" architectures to "arm64" moby/swarmkit@28f91d8...ce5f7b8 Signed-off-by: Marcus Martins <marcus@docker.com>
Support for PidsLimit was added to SwarmKit in moby/swarmkit/pull/2415, but never exposed through the Docker remove API. This patch exposes the feature in the repote API. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Support for PidsLimit was added to SwarmKit in moby/swarmkit/pull/2415, but never exposed through the Docker remove API. This patch exposes the feature in the repote API. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 157c53c8e00a0e97eb6bd5f6b041c8cde96e5d3b Component: engine
This PR is to fix the issue add "--pids-limit" to "docker service create/update" option list in swarmkit.
And we will add the flag in
docker service create/update
after this PR is accepted.