-
Notifications
You must be signed in to change notification settings - Fork 143
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
Conversation
👋 Welcome back jdowland! A progress list of the required criteria for merging this PR into |
This backport pull request has now been updated with issue from the original commit. |
/clean |
@jmtd This backport pull request is now marked as clean |
8bb7bb0
to
92bd500
Compare
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 |
@jmtd this pull request can not be integrated into 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 |
48414a2
to
5e1206f
Compare
@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 This change now passes all automated pre-integration checks. After integration, the commit message for the final commit will be:
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 ➡️ To integrate this PR with the above commit message to the |
5e1206f
to
7c0dab2
Compare
@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. |
72765b5
to
bed968b
Compare
…sabled on some systems Backport-of: 669361117d30c9904813b6f728714f8d6abe8484
7c0dab2
to
31d0616
Compare
@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. |
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 |
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 |
Going to push as commit b2619cf. |
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
Issue
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