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

8293472: Incorrect container resource limit detection if manual cgroup fs mounts present #1525

Closed
wants to merge 1 commit into from

Conversation

jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Nov 17, 2022

Clean backport. Testing on cg 1 and cg 2 passes for me.


Progress

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

Issue

  • JDK-8293472: Incorrect container resource limit detection if manual cgroup fs mounts present

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1525

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

Using diff file

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

…p fs mounts present

Backport-of: 8f3bbe950fb5a3d9f6cae122209df01df0f342f0
@bridgekeeper
Copy link

bridgekeeper bot commented Nov 17, 2022

👋 Welcome back sgehwolf! A progress list of the required criteria for merging this PR into master 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 8f3bbe950fb5a3d9f6cae122209df01df0f342f0 8293472: Incorrect container resource limit detection if manual cgroup fs mounts present Nov 17, 2022
@openjdk
Copy link

openjdk bot commented Nov 17, 2022

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

@openjdk
Copy link

openjdk bot commented Nov 17, 2022

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

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

8293472: Incorrect container resource limit detection if manual cgroup fs mounts present

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 rfr Pull request is ready for review labels Nov 17, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 17, 2022

Webrevs

@jerboaa
Copy link
Contributor Author

jerboaa commented Nov 18, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Nov 18, 2022

Going to push as commit 7706fa8.
Since your change was applied there have been 3 commits pushed to the master branch:

  • 4ee685a: 8029633: Raw inner class constructor ref should not perform diamond inference
  • 1f17371: 8296652: Restore windows aarch64 fixpath patch that was removed in 8239708
  • 5043784: 8256109: Create implementation for NSAccessibilityButton protocol

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 18, 2022

@jerboaa Pushed as commit 7706fa8.

💡 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
1 participant