Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 3 commits into from

Conversation

jmtd
Copy link
Contributor

@jmtd jmtd commented Nov 7, 2022

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

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
Copy link

bridgekeeper bot commented Nov 7, 2022

👋 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 openjdk bot changed the title Backport 0054c15f60cce6470be05d29bfacbdb74cfb7bc9 8253435: Cgroup: 'stomping of _mount_path' crash if manually mounted cpusets exist Nov 7, 2022
@openjdk
Copy link

openjdk bot commented Nov 7, 2022

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

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

mlbridge bot commented Nov 7, 2022

Webrevs

@jerboaa
Copy link
Contributor

jerboaa commented Nov 7, 2022

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.",

@openjdk
Copy link

openjdk bot commented Nov 8, 2022

⚠️ @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).

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@@ -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,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jmtd
Copy link
Contributor Author

jmtd commented Nov 11, 2022

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
Copy link
Contributor Author

jmtd commented Nov 11, 2022

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
Copy link

@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
Copy link

@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.

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good now. Thanks!

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 9, 2022

@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
Copy link
Contributor

jerboaa commented Dec 9, 2022

Keep open please.

@openjdk
Copy link

openjdk bot commented Dec 12, 2022

@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 openjdk-notifier bot changed the base branch from pr/157 to master December 15, 2022 10:58
@openjdk-notifier
Copy link

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
Copy link

openjdk bot commented Dec 15, 2022

@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
Copy link

openjdk bot commented Dec 15, 2022

@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.

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

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@jmtd
Copy link
Contributor Author

jmtd commented Dec 15, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Dec 15, 2022

Going to push as commit 2bee645.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 15, 2022
@openjdk openjdk bot closed this Dec 15, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 15, 2022
@openjdk
Copy link

openjdk bot commented Dec 15, 2022

@jmtd Pushed as commit 2bee645.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants