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

8266490: Extend the OSContainer API to support the pids controller of cgroups #1089

Closed
wants to merge 2 commits into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented May 16, 2022

The backport of 8266490 does not apply cleanly. Some copyright years need adjustment. The code in os_linux.cpp is slightly different in 11 compared to 17 and needs manual adjustment. TestPids.java needs change in the "run driver" line regarding whitebox (adjusted to jdk11 needs).


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (1 review required, with at least 1 reviewer)

Issue

  • JDK-8266490: Extend the OSContainer API to support the pids controller of cgroups

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1089

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 16, 2022

👋 Welcome back mbaesken! 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 089e83bf1bf6f28cec8dd30288720b6d066301f0 8266490: Extend the OSContainer API to support the pids controller of cgroups May 16, 2022
@openjdk
Copy link

openjdk bot commented May 16, 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 May 16, 2022
@mlbridge
Copy link

mlbridge bot commented May 16, 2022

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

Original change modifies Copyright of cgroupV2Subsystem_linux.cpp. Please add that before integrating. Otherwise, lgtm.

src/hotspot/os/linux/os_linux.cpp Show resolved Hide resolved
@openjdk
Copy link

openjdk bot commented May 16, 2022

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

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

8266490: Extend the OSContainer API to support the pids controller of cgroups

Reviewed-by: mdoerr

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 1 new commit pushed to the master branch:

  • 0056b9b: 8227389: Remove unsupported xlc16 compile options on aix

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 16, 2022
@MBaesken
Copy link
Member Author

Original change modifies Copyright of cgroupV2Subsystem_linux.cpp. Please add that before integrating. Otherwise, lgtm.

Hi Martin, the Copyright was already changed by other backports, see
https://github.com/openjdk/jdk11u-dev/blob/master/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp#L2

so it does not need to changed in this PR:

@TheRealMDoerr
Copy link
Contributor

Original change modifies Copyright of cgroupV2Subsystem_linux.cpp. Please add that before integrating. Otherwise, lgtm.

Hi Martin, the Copyright was already changed by other backports, see https://github.com/openjdk/jdk11u-dev/blob/master/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp#L2

so it does not need to changed in this PR:

Ok. So, only adding the empty line would be nice.

@MBaesken
Copy link
Member Author

Ok. So, only adding the empty line would be nice.

Done, added an empty line to os_linux.cpp .

@MBaesken
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 13, 2022

Going to push as commit 372af6a.
Since your change was applied there have been 53 commits pushed to the master branch:

  • 78aeb51: 8274517: java/util/DoubleStreamSums/CompensatedSums.java fails with expected [true] but found [false]
  • 71544cb: 8269517: compiler/loopopts/TestPartialPeelingSinkNodes.java crashes with -XX:+VerifyGraphEdges
  • 6ff4ba2: 8267271: Fix gc/arguments/TestNewRatioFlag.java expectedNewSize calculation
  • c6e4a44: 8183372: Refactor java/lang/Class shell tests to java
  • bf0ebd2: 8223575: add subspace transitions to gc+metaspace=info log lines
  • 39109e5: 8209736: runtime/RedefineTests/ModifyAnonymous.java fails with NullPointerException when running in CDS mode
  • cc6137c: 8069343: Improve gc/g1/TestHumongousCodeCacheRoots.java to use jtreg @requires
  • a87bfb8: 8286114: [test] show real exception in bomb call in sun/rmi/runtime/Log/checkLogging/CheckLogging.java
  • bb5d2bb: 8239902: [macos] Remove direct usage of JSlider, JProgressBar classes in CAccessible class
  • 16d0b7d: 8210107: vmTestbase/nsk/stress/network tests fail with Cannot assign requested address (Bind failed)
  • ... and 43 more: https://git.openjdk.org/jdk11u-dev/compare/c9d3291e2744ab18f3cf00ef852b70abdc800855...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 13, 2022

@MBaesken Pushed as commit 372af6a.

💡 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 integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants