8349988: Change cgroup version detection logic to not depend on /proc/cgroups#779
Draft
jmtd wants to merge 4 commits intoopenjdk:masterfrom
Draft
8349988: Change cgroup version detection logic to not depend on /proc/cgroups#779jmtd wants to merge 4 commits intoopenjdk:masterfrom
jmtd wants to merge 4 commits intoopenjdk:masterfrom
Conversation
|
👋 Welcome back jdowland! A progress list of the required criteria for merging this PR into |
|
❗ This change is not yet ready to be integrated. |
…71d10f46a595 For whatever reason, `git cherry-pick` could not resolve the path to whitebox.cpp in 8u and didn't apply the changes. Here they are. This wasn't clean: the `validate_cgroup` change had context differences. I've opted to incorporate 11u's use of CG_INFO_LENGTH for cg_infos. Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
remove reference to pids controller remove os namespacing of fopen replace log_debug with tty->print_cr Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
|
This backport pull request has now been updated with issues from the original commit. |
Contributor
Author
gut feeling is these will be unrelated but I will investigate further. |
Contributor
Author
|
reproduced those failures locally. now trying the master branch. Edit: yes same failures |
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
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.
Note: this adapts the 11u backport which (at the time of writing) is not yet approved.
This is a backport of an improvement to cgroup detection logic. This fixes mis-detection on some systems e.g. Debian and Ubuntu systems, or systems running a recent enough mainline kernel which no longer propagates the older
/proc/cgroupsfile with necessary controllers.This wasn't clean: there are a few C++ changes (
nullptrtoNULLsubstitutions,osnamespacing on cstd functions); logging mechanism changes; removal of PID controller related stuff.Cherry-picking note: for reasons unknown
gitfailed to apply the hunks forwhitebox.cppso I did those manually. It also patched the wrong copy ofWhiteBox.java. I'm hoping we can pick up JDK-8327993 which should resolve this for future cgroups backports.The modified
CgroupSubsystemFactory.javapasses.Progress
Issues
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/779/head:pull/779$ git checkout pull/779Update a local copy of the PR:
$ git checkout pull/779$ git pull https://git.openjdk.org/jdk8u-dev.git pull/779/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 779View PR using the GUI difftool:
$ git pr show -t 779Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/779.diff