Fix container cgroup under cgroupfs #4080
Merged
Conversation
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
In case cgroupfs cgroup manager is used, the container got created under the conmon cgroup (rather than under the root), and then the stats doesn't work because the cgroup path is invalid. For example, if the conmon cgroup is created as /sys/fs/cgroup/pod_123-456/crio-conmon-<ID>, then the container cgroup is created as /sys/fs/cgroup/pod_123-456/crio-conmon-<ID>/pod_123-456/crio-<ID>, rather than sys/fs/cgroup/pod_123-456/crio-conmon-<ID>. The `cricrl stats` then fails as it can't find the container cgroup. This happens because the cgroupsPath set in spec for such containers is not absolute, so the cgroup is created under the current cgroup, which is that of conmon. The fix is easy. Signed-off-by: Kir Kolyshkin <[email protected]>
Merged
Codecov Report
@@ Coverage Diff @@
## master #4080 +/- ##
=======================================
Coverage 41.17% 41.17%
=======================================
Files 109 109
Lines 9018 9018
=======================================
Hits 3713 3713
Misses 4966 4966
Partials 339 339 |
Member
|
/retest |
Member
|
/retest |
1 similar comment
Collaborator
Author
|
/retest |
Member
|
/lgtm |
Member
|
/retest |
| parent = sbParent | ||
| } | ||
| return filepath.Join(parent, crioPrefix+"-"+containerID) | ||
| return filepath.Join("/", parent, crioPrefix+"-"+containerID) |
Contributor
There was a problem hiding this comment.
IDK, but should we be doing a securejoin here?
Collaborator
Author
There was a problem hiding this comment.
I don't think so.
- This is not an absolute path, but a one relative to /sys/fs/cgroup.
- runc/crun [should] do sanity checks.
- The only untrusted component here is parent, this is a cgroup of sandbox, which is also created by cri-o.
Member
|
/retest |
2 similar comments
Collaborator
Author
|
/retest |
Member
|
/retest |
mrunalp
approved these changes
Aug 17, 2020
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: kolyshkin, mrunalp, saschagrunert The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Member
|
/test e2e-aws |
Member
|
/retest |
Member
|
/test e2e-aws |
Collaborator
Author
|
CI is all green now, although |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 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.
What type of PR is this?
/kind bug
What this PR does / why we need it:
In case cgroupfs cgroup manager is used, the container got created under
the conmon cgroup (rather than under the root), and then the stats
doesn't work because the cgroup path is invalid.
For example, if the conmon cgroup is created as
/sys/fs/cgroup/pod_123-456/crio-conmon-, then the container cgroup
is created as
/sys/fs/cgroup/pod_123-456/crio-conmon-/pod_123-456/crio-,
rather than sys/fs/cgroup/pod_123-456/crio-conmon-.
The
cricrl statsthen fails as it can't find the container cgroup.This happens because the cgroupsPath set in spec for such containers
is not absolute, so the cgroup is created under the current cgroup,
which is that of conmon.
The fix is easy.
Which issue(s) this PR fixes:
Fixes #4075
Special notes for your reviewer:
Found while working on #4064. That PR has a test case (in test/stats.bats) which will check this issue, so there's no test case in here.
Does this PR introduce a user-facing change?