Skip to content

8265836: OperatingSystemImpl.getCpuLoad() returns incorrect CPU load inside a container #20

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

Closed
wants to merge 1 commit into from

Conversation

jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Jun 8, 2021

JDK-8265836 applies to OpenJDK 11u as well. Patch applies clean. The only difference is in context. JDK head changed method getCpuLoad() while the JDK 11u backport changes getSystemCpuLoad() as that name hasn't been changed when the OperatingSystemMXBean has been made container aware in 11u.

Testing: Manual using the reproducer of the bug. See the backport bug for details.


Progress

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

Issue

  • JDK-8265836: OperatingSystemImpl.getCpuLoad() returns incorrect CPU load inside a container

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 8, 2021

👋 Welcome back sgehwolf! 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 ef368b32bc8609bdc46cda628fa25e9bcad751e3 8265836: OperatingSystemImpl.getCpuLoad() returns incorrect CPU load inside a container Jun 8, 2021
@openjdk
Copy link

openjdk bot commented Jun 8, 2021

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

@openjdk
Copy link

openjdk bot commented Jun 8, 2021

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

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

8265836: OperatingSystemImpl.getCpuLoad() returns incorrect CPU load inside a container

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 rfr Pull request is ready for review labels Jun 8, 2021
@mlbridge
Copy link

mlbridge bot commented Jun 8, 2021

Webrevs

@jerboaa
Copy link
Contributor Author

jerboaa commented Jun 11, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Jun 11, 2021

Going to push as commit 37f36d5.
Since your change was applied there have been 3 commits pushed to the master branch:

  • 9dc8826: 8254244: Some code emitted by TemplateTable::branch is unused when running TieredCompilation
  • d31ceee: 8253048: AArch64: When CallLeaf, no need to preserve callee-saved registers in caller
  • 941ad85: 8262392: Update Mesa 3-D Headers to version 21.0.3

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jun 11, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 11, 2021
@openjdk
Copy link

openjdk bot commented Jun 11, 2021

@jerboaa Pushed as commit 37f36d5.

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

1 participant