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

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

Closed
wants to merge 1 commit into from

Conversation

jmtd
Copy link
Contributor

@jmtd jmtd commented Nov 7, 2022

This is a clean backport of 8252359 to jdk8u-dev, as part of cgroups v2 support.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8252359: HotSpot Not Identifying it is Running in a Container

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 157

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/157.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/155 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 76f0588aaf265439a589cceb924e3ea9d3fda8f1 8252359: HotSpot Not Identifying it is Running in a Container 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 11, 2022

Clean backport, only path changes. Marking as such.

@jerboaa
Copy link
Contributor

jerboaa commented Nov 11, 2022

/clean

@openjdk openjdk bot added the clean label Nov 11, 2022
@openjdk
Copy link

openjdk bot commented Nov 11, 2022

@jerboaa This backport pull request is now marked as clean

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

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

openjdk bot commented Dec 12, 2022

@jmtd this pull request can not be integrated into pr/155 due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8252359-jdk8u-dev
git fetch https://git.openjdk.org/jdk8u-dev pr/155
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge pr/155"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Dec 12, 2022
Backport-of: 76f0588aaf265439a589cceb924e3ea9d3fda8f1
@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-notifier openjdk-notifier bot changed the base branch from pr/155 to master December 15, 2022 09:59
@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 8252359-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 This change now passes all automated pre-integration checks.

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

8252359: HotSpot Not Identifying it is Running in a Container

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 ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Dec 15, 2022
@jerboaa
Copy link
Contributor

jerboaa commented Dec 15, 2022

Approved for 8u. Please integrate and then rebase #158. Thanks!

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

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

💡 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 clean integrated Pull request has been integrated
2 participants