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

8253714: [cgroups v2] Soft memory limit incorrectly using memory.high #130

Closed
wants to merge 1 commit into from

Conversation

jmtd
Copy link
Contributor

@jmtd jmtd commented Oct 5, 2022

This is a backport of a cgroupsv2 related change for jdk8u-dev.


The early implementation of cgroups v2 support was done with crun 0.8 and it contained a bug which set memory.high over memory.low when --memory-reservation was being used as a CLI option.

This bug has been fixed in later crun versions, starting with crun 0.11. Use memory.low in OpenJDK as well.

Backport-of: ff6843ca4842498791061f924c545fa9469cc1dc


Progress

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

Issue

  • JDK-8253714: [cgroups v2] Soft memory limit incorrectly using memory.high

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 130

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 5, 2022

👋 Welcome back jdowland! A progress list of the required criteria for merging this PR into pr/128 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 ff6843ca4842498791061f924c545fa9469cc1dc 8253714: [cgroups v2] Soft memory limit incorrectly using memory.high Oct 5, 2022
@openjdk
Copy link

openjdk bot commented Oct 5, 2022

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

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

mlbridge bot commented Oct 5, 2022

Webrevs

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

@jerboaa
Copy link
Contributor

jerboaa commented Nov 4, 2022

This is a clean backport and only shuffles paths. Marking as such.

@jerboaa
Copy link
Contributor

jerboaa commented Nov 4, 2022

/clean

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

openjdk bot commented Nov 4, 2022

@jerboaa This backport pull request is now marked as clean

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 2, 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!

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Confirmed clean and approved.

Not sure why it needed 23 commits in this case... :/

@openjdk
Copy link

openjdk bot commented Dec 5, 2022

@jmtd this pull request can not be integrated into pr/121 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 8253714-jdk8u-dev
git fetch https://git.openjdk.org/jdk8u-dev pr/121
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge pr/121"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Dec 5, 2022
@jmtd
Copy link
Contributor Author

jmtd commented Dec 5, 2022

@gnu-andrew the 23 commits are likely a result of the PR branch and the target branch diverging too much so copies of already merged stuff is showing up. I’ll have to do a manual rebase of the PR before it can be integrated.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/121 to master December 5, 2022 04:17
@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 8253714-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

@jerboaa
Copy link
Contributor

jerboaa commented Dec 5, 2022

@jmtd Please rebase to latest master. Happy for you to mark as /clean again, once that's done. This will likely be a recurring theme (manual rebase/cherry-pick) for other dependent PRs :-/

The early implementation of cgroups v2 support was done with
crun 0.8 and it contained a bug which set memory.high over
memory.low when --memory-reservation was being used as a CLI
option.

This bug has been fixed in later crun versions, starting with
crun 0.11. Use memory.low in OpenJDK as well.

Backport-of: ff6843ca4842498791061f924c545fa9469cc1dc
@jmtd
Copy link
Contributor Author

jmtd commented Dec 5, 2022

Greatings from Schipol!

@jerboaa :

Please rebase to latest master.

Done

Happy for you to mark as /clean again, once that's done.

OK

/clean

This will likely be a recurring theme (manual rebase/cherry-pick) for other dependent PRs :-/

I'm afraid I agree :-(

@openjdk
Copy link

openjdk bot commented Dec 5, 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 5, 2022

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

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

8253714: [cgroups v2] Soft memory limit incorrectly using memory.high

The early implementation of cgroups v2 support was done with
crun 0.8 and it contained a bug which set memory.high over
memory.low when --memory-reservation was being used as a CLI
option.

This bug has been fixed in later crun versions, starting with
crun 0.11. Use memory.low in OpenJDK as well.

Reviewed-by: andrew

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 5, 2022
@openjdk
Copy link

openjdk bot commented Dec 5, 2022

@jmtd This backport pull request is already marked as clean

@jerboaa
Copy link
Contributor

jerboaa commented Dec 5, 2022

Looks good. Feel free to integrate.

@jmtd
Copy link
Contributor Author

jmtd commented Dec 7, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Dec 7, 2022

Going to push as commit 633acfa.
Since your change was applied there have been 10 commits pushed to the master branch:

  • 40e7b68: 8295952: Problemlist existing compiler/rtm tests also on x86
  • 3f44b9b: 8296957: One more cast in SAFE_SIZE_NEW_ARRAY2
  • 2ad48cb: 8294767: 8u contains two copies of test/../FileUtils.java, one uses JDK9+ features
  • da681cf: 8296496: Overzealous check in sizecalc.h prevents large memory allocation
  • d13b813: 8284690: [macos] VoiceOver : Getting java.lang.IllegalArgumentException: Invalid location on Editable JComboBox
  • 2abc206: 8257620: Do not use objc_msgSend_stret to get macOS version
  • 72269ee: 8296632: Write a test to verify the content change of TextArea sends TextEvent
  • a983a00: 6829250: Reg test: java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java fails in Windows
  • 4388fa8: 8296485: BuildEEBasicConstraints.java test fails with SunCertPathBuilderException
  • 21a1236: 8296480: java/security/cert/pkix/policyChanges/TestPolicy.java is failing

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 7, 2022

@jmtd Pushed as commit 633acfa.

💡 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
4 participants