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 #865

Closed

Conversation

zhengyu123
Copy link
Contributor

@zhengyu123 zhengyu123 commented Mar 8, 2022

A clean, followup (JDK-8231111) backport for Cgroup V2 support.


Progress

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

Issue

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

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/865/head:pull/865
$ git checkout pull/865

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 865

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/865.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 8, 2022

👋 Welcome back zgu! A progress list of the required criteria for merging this PR into pr/863 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 Mar 8, 2022
@openjdk
Copy link

openjdk bot commented Mar 8, 2022

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

@openjdk openjdk bot added backport clean rfr labels Mar 8, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 8, 2022

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/863 to master Mar 23, 2022
@openjdk-notifier
Copy link

openjdk-notifier bot commented Mar 23, 2022

The dependent pull request 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 backport-8231111-unified-hierarchy
git fetch https://git.openjdk.java.net/jdk11u-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 openjdk bot removed the clean label Mar 23, 2022
@openjdk
Copy link

openjdk bot commented Mar 23, 2022

@zhengyu123 this pull request can not be integrated into master 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 backport-8253714-memory.high
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict label Mar 23, 2022
@zhengyu123
Copy link
Contributor Author

zhengyu123 commented Mar 23, 2022

Followed above instructions to resolve dependency pull, but resulted many conflicts. Replace this with PR 941, which is a clean backport.

@zhengyu123 zhengyu123 closed this Mar 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge-conflict rfr
1 participant