fixes for pkg/sysinfo/checkCgroupPids#162
Merged
giuseppe merged 2 commits intocontainers:masterfrom May 23, 2020
Merged
Conversation
In case we failed to find out what version of cgroup we have, it makes little sense to return that pids cgroup controller is available, and yet the current code does it. Fix this. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
For some reason this code chose not to use information already fetched, and call cgroups.FindCgroupMountpoint() instead. This is not a cheap call, as it has to parse the whole nine yards of /proc/self/mountinfo, and the info it tries to get (whether the pids controller is present) is already available from cgMounts map. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Member
|
LGTM |
Member
|
LGTM |
M1cha
pushed a commit
to M1cha/common
that referenced
this pull request
Dec 20, 2022
dns: Add support for `DNS` with containers via `aardvark`.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
1. pkg/sysinfo.checkCgroupPids: fix error path
In case we failed to find out what version of cgroup we have,
it makes little sense to return that pids cgroup controller
is available, and yet the current code does it.
Fix this.
2. pkg/sysinfo.checkCgroupPids: speedup
For some reason this code chose not to use information already fetched,
and call cgroups.FindCgroupMountpoint() instead. This is not a cheap
call, as it has to parse the whole nine yards of /proc/self/mountinfo,
and the info it tries to get (whether the pids controller is present)
is already available from cgMounts map.
This also prepares the code for the upcoming changes in runc (opencontainers/runc#2411).