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

Closed
wants to merge 1 commit into from

Conversation

ebaron
Copy link
Member

@ebaron ebaron commented Apr 1, 2022

Hi all,

This pull request contains a backport of commit 66936111 from the openjdk/jdk repository.

The commit being backported was authored by Severin Gehwolf on 10 Dec 2020 and was reviewed by Harold Seigel.

Thanks!


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.java.net/jdk11u-dev pull/987/head:pull/987
$ git checkout pull/987

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 987

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 1, 2022

👋 Welcome back ebaron! 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 669361117d30c9904813b6f728714f8d6abe8484 8253797: [cgroups v2] Account for the fact that swap accounting is disabled on some systems Apr 1, 2022
@openjdk
Copy link

openjdk bot commented Apr 1, 2022

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

@openjdk
Copy link

openjdk bot commented Apr 1, 2022

@ebaron 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 50 new commits pushed to the master branch:

  • 8482b37: 8284756: [11u] Remove unused isUseContainerSupport in CgroupV1Subsystem
  • 1f20c8d: 8281274: deal with ActiveProcessorCount in os::Linux::print_container_info
  • bc28d8f: 8217233: Update build settings for AIX/xlc
  • 24fec25: 8203238: [TESTBUG] rewrite MemOptions shell test in Java
  • f5586d9: 8203239: [TESTBUG] remove vmTestbase/vm/gc/kind/parOld test
  • 3a6dbb4: 8208207: Test nsk/stress/jni/gclocker/gcl001 fails after co-location
  • 684fe80: 8220658: Improve the readability of container information in the error log
  • c38229f: 8284507: GHA: Only check test results if testing was not skipped
  • 6f0e5b1: 8284604: [11u] Update Boot JDK used in GHA to 11.0.14.1
  • 869b259: 8284389: Improve stability of GHA Pre-submit testing by caching cygwin installer
  • ... and 40 more: https://git.openjdk.java.net/jdk11u-dev/compare/4c8b0990333913bb990c40200515dd83149bb843...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 1, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 1, 2022

Webrevs

@ebaron
Copy link
Member Author

ebaron commented Apr 13, 2022

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Apr 13, 2022
@openjdk
Copy link

openjdk bot commented Apr 13, 2022

@ebaron
Your change (at version e2839b1) is now ready to be sponsored by a Committer.

@jerboaa
Copy link
Contributor

jerboaa commented Apr 14, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Apr 14, 2022

Going to push as commit 8de4b89.
Since your change was applied there have been 50 commits pushed to the master branch:

  • 8482b37: 8284756: [11u] Remove unused isUseContainerSupport in CgroupV1Subsystem
  • 1f20c8d: 8281274: deal with ActiveProcessorCount in os::Linux::print_container_info
  • bc28d8f: 8217233: Update build settings for AIX/xlc
  • 24fec25: 8203238: [TESTBUG] rewrite MemOptions shell test in Java
  • f5586d9: 8203239: [TESTBUG] remove vmTestbase/vm/gc/kind/parOld test
  • 3a6dbb4: 8208207: Test nsk/stress/jni/gclocker/gcl001 fails after co-location
  • 684fe80: 8220658: Improve the readability of container information in the error log
  • c38229f: 8284507: GHA: Only check test results if testing was not skipped
  • 6f0e5b1: 8284604: [11u] Update Boot JDK used in GHA to 11.0.14.1
  • 869b259: 8284389: Improve stability of GHA Pre-submit testing by caching cygwin installer
  • ... and 40 more: https://git.openjdk.java.net/jdk11u-dev/compare/4c8b0990333913bb990c40200515dd83149bb843...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 14, 2022

@jerboaa @ebaron Pushed as commit 8de4b89.

💡 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
Development

Successfully merging this pull request may close these issues.

2 participants