8253435: Cgroup: 'stomping of _mount_path' crash if manually mounted cpusets exist #158

jmtd · 2022-11-07T10:22:13Z

This is a backport of 8253435 to jdk8u-dev for cgroups v2 support.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8253435: Cgroup: 'stomping of _mount_path' crash if manually mounted cpusets exist

Reviewers

Severin Gehwolf (@jerboaa - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev pull/158/head:pull/158
$ git checkout pull/158

Update a local copy of the PR:
$ git checkout pull/158
$ git pull https://git.openjdk.org/jdk8u-dev pull/158/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 158

View PR using the GUI difftool:
$ git pr show -t 158

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/158.diff

bridgekeeper · 2022-11-07T10:23:53Z

👋 Welcome back jdowland! A progress list of the required criteria for merging this PR into pr/157 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2022-11-07T10:25:29Z

This backport pull request has now been updated with issue from the original commit.

mlbridge · 2022-11-07T10:31:17Z

Webrevs

jerboaa · 2022-11-07T10:32:24Z

This one will need changes. Build fails with:

 /home/runner/work/jdk8u-dev/jdk8u-dev/jdk/hotspot/src/os/linux/vm/cgroupSubsystem_linux.cpp: In static member function ‘static bool CgroupSubsystemFactory::determine_type(CgroupInfo*, const char*, const char*, const char*, u1*)’:
/home/runner/work/jdk8u-dev/jdk8u-dev/jdk/hotspot/src/os/linux/vm/cgroupSubsystem_linux.cpp:318:29: error: expected primary-expression before ‘,’ token
  318 |               log_warning(os, container)("Duplicate cpuset controllers detected. Picking %s, skipping %s.",

hotspot/test/runtime/containers/cgroup/CgroupSubsystemFactory.java

openjdk · 2022-11-08T14:08:53Z

⚠️ @jmtd This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

jerboaa

There seems to be a problem with this PR. It shows commits not part of this PR, but others (e.g. #135). The bot is also not happy about it. Before this can get properly reviewed, this would need some fixup.

jerboaa · 2022-11-11T13:09:17Z

hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java

@@ -256,5 +256,8 @@ public int getOffsetForName(String name) throws Exception {
  // Container testing
  public native boolean isContainerized();
  public native void printOsInfo();
+  public native int validateCgroup(String procCgroups,


This doesn't look right. It's part of #135. See: https://github.com/openjdk/jdk8u-dev/pull/135/files#diff-840578f66556c33204f36e83d8c5a6b6b91c0280ffdbbea6121847a5b6b1afe7R259

jmtd · 2022-11-11T14:11:36Z

There seems to be a problem with this PR. It shows commits not part of this PR, but others (e.g. #135). The bot is also not happy about it. Before this can get properly reviewed, this would need some fixup.

Sorry about that. I think the merge hasn't worked. (I can't confirm that at the time I did it because we have to wait for the bot to update the pr/ branch in the main repository for the web view to show the proper comparison). I'll do a rebase and see what it looks like.

jmtd · 2022-11-11T16:18:45Z

I've rebased but PR 135's commits are still missing in the chain for this one so further work is required to find out where things have gone out of sync.

openjdk-notifier · 2022-11-11T16:23:57Z

@jmtd Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

openjdk-notifier · 2022-11-11T16:34:42Z

@jmtd Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

jerboaa

This looks good now. Thanks!

bridgekeeper · 2022-12-09T17:56:06Z

@jmtd This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

jerboaa · 2022-12-09T17:58:13Z

Keep open please.

openjdk · 2022-12-12T09:49:55Z

@jmtd Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

…cpusets exist Backport-of: 0054c15f60cce6470be05d29bfacbdb74cfb7bc9

openjdk-notifier · 2022-12-15T10:58:34Z

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8253435-jdk8u-dev
git fetch https://git.openjdk.org/jdk8u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

openjdk · 2022-12-15T10:59:51Z

@jmtd Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

openjdk · 2022-12-15T11:01:06Z

@jmtd This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8253435: Cgroup: 'stomping of _mount_path' crash if manually mounted cpusets exist

Reviewed-by: sgehwolf

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

jerboaa

OK. Feel free to integrate and then rebase #159. Thank you!

jmtd · 2022-12-15T13:45:07Z

/integrate

openjdk · 2022-12-15T13:46:50Z

Going to push as commit 2bee645.

openjdk · 2022-12-15T13:47:15Z

@jmtd Pushed as commit 2bee645.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

openjdk bot changed the title ~~Backport 0054c15f60cce6470be05d29bfacbdb74cfb7bc9~~ 8253435: Cgroup: 'stomping of _mount_path' crash if manually mounted cpusets exist Nov 7, 2022

openjdk bot added backport rfr Pull request is ready for review labels Nov 7, 2022

openjdk bot mentioned this pull request Nov 7, 2022

8245543: Cgroups: Incorrect detection logic on some systems (still reproducible) #159

Closed

3 tasks

jerboaa reviewed Nov 8, 2022

View reviewed changes

hotspot/test/runtime/containers/cgroup/CgroupSubsystemFactory.java Outdated Show resolved Hide resolved

jerboaa suggested changes Nov 11, 2022

View reviewed changes

openjdk-notifier bot force-pushed the pr/157 branch from 936609c to 793364d Compare November 11, 2022 15:40

jmtd force-pushed the 8253435-jdk8u-dev branch from 9b22583 to 95e430e Compare November 11, 2022 16:18

jmtd force-pushed the 8253435-jdk8u-dev branch from 95e430e to 00dc64a Compare November 11, 2022 16:26

openjdk-notifier bot force-pushed the pr/157 branch from 793364d to 34b0259 Compare November 11, 2022 16:30

jerboaa approved these changes Nov 11, 2022

View reviewed changes

jmtd force-pushed the 8253435-jdk8u-dev branch from 00dc64a to 4ea4662 Compare December 12, 2022 09:46

openjdk-notifier bot force-pushed the pr/157 branch from 34b0259 to 564b1a0 Compare December 12, 2022 09:49

openjdk-notifier bot force-pushed the pr/157 branch from 564b1a0 to c849e96 Compare December 15, 2022 10:02

jerboaa mentioned this pull request Dec 15, 2022

8252359: HotSpot Not Identifying it is Running in a Container #157

Closed

2 tasks

jmtd added 3 commits December 15, 2022 10:57

8253435: Cgroup: 'stomping of _mount_path' crash if manually mounted …

36c59f7

…cpusets exist Backport-of: 0054c15f60cce6470be05d29bfacbdb74cfb7bc9

Replace log_warning with tty->print_cr

4f90ebe

Severin's test fixes. Thanks!

5943791

jmtd force-pushed the 8253435-jdk8u-dev branch from 4ea4662 to 5943791 Compare December 15, 2022 10:57

openjdk-notifier bot changed the base branch from pr/157 to master December 15, 2022 10:58

openjdk bot added the ready Pull request is ready to be integrated label Dec 15, 2022

jerboaa approved these changes Dec 15, 2022

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Dec 15, 2022

openjdk bot closed this Dec 15, 2022

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 15, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8253435: Cgroup: 'stomping of _mount_path' crash if manually mounted cpusets exist #158

8253435: Cgroup: 'stomping of _mount_path' crash if manually mounted cpusets exist #158

jmtd commented Nov 7, 2022 •

edited by openjdk bot

Loading

bridgekeeper bot commented Nov 7, 2022

openjdk bot commented Nov 7, 2022

mlbridge bot commented Nov 7, 2022 •

edited

Loading

jerboaa commented Nov 7, 2022

openjdk bot commented Nov 8, 2022

jerboaa left a comment

jerboaa Nov 11, 2022

jmtd commented Nov 11, 2022 •

edited

Loading

jmtd commented Nov 11, 2022

openjdk-notifier bot commented Nov 11, 2022

openjdk-notifier bot commented Nov 11, 2022

jerboaa left a comment

bridgekeeper bot commented Dec 9, 2022

jerboaa commented Dec 9, 2022

openjdk bot commented Dec 12, 2022

openjdk-notifier bot commented Dec 15, 2022

openjdk bot commented Dec 15, 2022

openjdk bot commented Dec 15, 2022

jerboaa left a comment

jmtd commented Dec 15, 2022

openjdk bot commented Dec 15, 2022

openjdk bot commented Dec 15, 2022

8253435: Cgroup: 'stomping of _mount_path' crash if manually mounted cpusets exist #158

8253435: Cgroup: 'stomping of _mount_path' crash if manually mounted cpusets exist #158

Conversation

jmtd commented Nov 7, 2022 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Nov 7, 2022

openjdk bot commented Nov 7, 2022

mlbridge bot commented Nov 7, 2022 • edited Loading

Webrevs

jerboaa commented Nov 7, 2022

openjdk bot commented Nov 8, 2022

jerboaa left a comment

Choose a reason for hiding this comment

jerboaa Nov 11, 2022

Choose a reason for hiding this comment

jmtd commented Nov 11, 2022 • edited Loading

jmtd commented Nov 11, 2022

openjdk-notifier bot commented Nov 11, 2022

openjdk-notifier bot commented Nov 11, 2022

jerboaa left a comment

Choose a reason for hiding this comment

bridgekeeper bot commented Dec 9, 2022

jerboaa commented Dec 9, 2022

openjdk bot commented Dec 12, 2022

openjdk-notifier bot commented Dec 15, 2022

openjdk bot commented Dec 15, 2022

openjdk bot commented Dec 15, 2022

jerboaa left a comment

Choose a reason for hiding this comment

jmtd commented Dec 15, 2022

openjdk bot commented Dec 15, 2022

openjdk bot commented Dec 15, 2022

jmtd commented Nov 7, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Nov 7, 2022 •

edited

Loading

jmtd commented Nov 11, 2022 •

edited

Loading