Fix emulated cgroups v1 subsystem when running docker-in-docker #2532
Conversation
This file contains 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
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #2532 +/- ##
==========================================
+ Coverage 65.87% 65.89% +0.01%
==========================================
Files 133 133
Lines 16868 16892 +24
==========================================
+ Hits 11112 11131 +19
- Misses 5756 5761 +5 |
jprendes
changed the title
utam0k
reviewed
Nov 16, 2023
Signed-off-by: Jorge Prendes <[email protected]>
utam0k
reviewed
Nov 17, 2023
Signed-off-by: utam0k <[email protected]>
utam0k
approved these changes
Nov 17, 2023
Yes, that's a good plan :-) |
|
Hey, should we go ahead and merge this fix as it is? We can add the tests in a separate PR if you want 👍 |
I'd like to include this PR in the next patch release, so please send out another PR 🙏 |
Will do. The tests will need the musl builds PR to be merged. I'll work on that first. |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #2528.
Normally the pid-1 cgroup path is empty, but this is not the case when running inside a container.
This needs to be accounted on for the cgroups subsystem emulation.
This PR fixes the source of the mountpoints for the emulated cgroups subsystem by stripping the cgroup paths of pid-1 from the mountpoint source path.
I also makes the failure to setup tracing to syslog a warning instead of fatal, as that fails with the
dockerimage used for docker-in-docker.I would like to add testing for this based on the reproduction steps in #2528, but that would be better done by building
youkias a static binary usingmusl(since thedockerimage is based onalpine). I would like to wait until we merge #2498 to addmuslsupport and add a test.