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

8253797: [cgroups v2] Account for the fact that swap accounting is disabled on some systems #185

Closed
wants to merge 1 commit into from

Conversation

jmtd
Copy link
Contributor

@jmtd jmtd commented Nov 18, 2022

This is a clean backport of 8253797 (via 11u) for jdk8u-dev for cgroups v2 support.

The changed files are exercised by the jtreg test TestSystemMetrics.java which passes on my cgroups v2 system.


Progress

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

Issue

  • JDK-8253797: [cgroups v2] Account for the fact that swap accounting is disabled on some systems

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 185

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 18, 2022

👋 Welcome back jdowland! A progress list of the required criteria for merging this PR into pr/168 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 669361117d30c9904813b6f728714f8d6abe8484 8253797: [cgroups v2] Account for the fact that swap accounting is disabled on some systems Nov 18, 2022
@openjdk
Copy link

openjdk bot commented Nov 18, 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 18, 2022
@jmtd
Copy link
Contributor Author

jmtd commented Nov 18, 2022

/clean

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

openjdk bot commented Nov 18, 2022

@jmtd This backport pull request is now marked as clean

@mlbridge
Copy link

mlbridge bot commented Nov 18, 2022

Webrevs

@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 8253797-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 7, 2022

@jmtd 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 8253797-jdk8u-dev
git fetch https://git.openjdk.org/jdk8u-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 Pull request has merge conflict with target branch label Dec 7, 2022
@openjdk
Copy link

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

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

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

8253797: [cgroups v2] Account for the fact that swap accounting is disabled on some systems

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

@jmtd jmtd changed the base branch from master to pr/169 December 12, 2022 10:08
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Dec 12, 2022
…sabled on some systems

Backport-of: 669361117d30c9904813b6f728714f8d6abe8484
@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/169 to master December 15, 2022 18:07
@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 8253797-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 openjdk bot added the ready Pull request is ready to be integrated label Dec 15, 2022
@jmtd
Copy link
Contributor Author

jmtd commented Dec 15, 2022

Oddly we got this approved a week ago. I've rebased since, so I've just double-checked that the patch is clean (yes)

/integrate

@openjdk
Copy link

openjdk bot commented Dec 15, 2022

Going to push as commit b2619cf.

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

💡 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