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

8326446: The User and System of jdk.CPULoad on Apple M1 are inaccurate #2277

Closed
wants to merge 1 commit into from

Conversation

yanglong1010
Copy link
Contributor

@yanglong1010 yanglong1010 commented Mar 8, 2024

Hi, all

Could I have a review of this backport.

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

Testing: I ran test/jdk/jdk/jfr/event/os/TestCPULoad.java and passed. All GHA tests are passed (except linux-cross-compile, build(riscv64), Create sysroot. It looks like there's an issue with the GHA's process).


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8326446 needs maintainer approval

Issue

  • JDK-8326446: The User and System of jdk.CPULoad on Apple M1 are inaccurate (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2277

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 8, 2024

👋 Welcome back yanglong1010! 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 8dbd4b391f7deb1a46a5f07f0bc46f23d6715ddb 8326446: The User and System of jdk.CPULoad on Apple M1 are inaccurate Mar 8, 2024
@openjdk
Copy link

openjdk bot commented Mar 8, 2024

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 Mar 8, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 8, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Mar 13, 2024

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8326446: The User and System of jdk.CPULoad on Apple M1 are inaccurate

Reviewed-by: phh

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

  • 787cf27: 8265919: RunThese30M fails "assert((!(((((JfrTraceIdBits::load(value)) & ((1 << 4) << 8)) != 0))))) failed: invariant"
  • 24aa1e1: 8313873: java/nio/channels/DatagramChannel/SendReceiveMaxSize.java fails on AIX due to small default RCVBUF size and different IPv6 Header interpretation
  • cc3f0e5: 8308144: Uncontrolled memory consumption in SSLFlowDelegate.Reader
  • 1ead7a7: 8331265: Bump update version for OpenJDK: jdk-17.0.13
  • c9d83d3: 8325203: System.exit(0) kills the launched 3rd party application
  • 0cfee92: 8294699: Launcher causes lingering busy cursor
  • f4da0e7: 8329223: Parallel: Parallel GC resizes heap even if -Xms = -Xmx
  • d1e31f6: 8289643: File descriptor leak with ProcessBuilder.startPipeline
  • 69e6736: 8314835: gtest wrappers should be marked as flagless
  • 6c3a188: 8320681: [macos] Test tools/jpackage/macosx/MacAppStoreJlinkOptionsTest.java timed out on macOS
  • ... and 204 more: https://git.openjdk.org/jdk17u-dev/compare/f221ff38300b5513a06e5755469668ef83556a3a...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. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ 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).

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 10, 2024

@yanglong1010 This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@yanglong1010
Copy link
Contributor Author

Gentle ping. I would be very grateful if anyone could help with the review.

@openjdk
Copy link

openjdk bot commented Apr 17, 2024

⚠️ @yanglong1010 This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@yanglong1010
Copy link
Contributor Author

/approval 8326446 request The JFR's jdk.CPULoad event provides information about how much CPU is occupied by Java process, often used in performance analysis. But the User and System percentages of jdk.CPULoad event on Apple M1 are inaccurate (far below normal). I would like to backport this fix to jdk17u-dev.
Low risk: This patch only affects the User and System percentages of JFR's jdk.CPULoad event.
Testing: I ran test/jdk/jdk/jfr/event/os/TestCPULoad.java and passed. All GHA tests are passed (except linux-cross-compile, build(riscv64), Create sysroot. It looks like there's an issue with the GHA's process).

@openjdk
Copy link

openjdk bot commented Apr 18, 2024

@yanglong1010
8326446: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Apr 18, 2024
@GoeLin
Copy link
Member

GoeLin commented Apr 19, 2024

@yanglong1010, could you please first do the 22u backport? Thanks.

@yanglong1010
Copy link
Contributor Author

Sure, I'll deal with it next week

@openjdk openjdk bot removed the approval label Apr 22, 2024
@yanglong1010
Copy link
Contributor Author

@yanglong1010, could you please first do the 22u backport? Thanks.

Hi, @GoeLin I don't know if you can handle the approval request for 22u.

@yanglong1010
Copy link
Contributor Author

@GoeLin The 22u backport has been done.

@yanglong1010
Copy link
Contributor Author

/approval 8326446 request The JFR's jdk.CPULoad event provides information about how much CPU is occupied by Java process, often used in performance analysis. But the User and System percentages of jdk.CPULoad event on Apple M1 are inaccurate (far below normal). I would like to backport this fix to jdk17u-dev.
Low risk: This patch only affects the User and System percentages of JFR's jdk.CPULoad event.
Testing: I ran test/jdk/jdk/jfr/event/os/TestCPULoad.java and passed. All GHA tests are passed (except linux-cross-compile, build(riscv64), Create sysroot. It looks like there's an issue with the GHA's process).

@openjdk
Copy link

openjdk bot commented May 29, 2024

@yanglong1010
8326446: The approval request was already up to date.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels May 29, 2024
@yanglong1010
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label May 29, 2024
@openjdk
Copy link

openjdk bot commented May 29, 2024

@yanglong1010
Your change (at version 84a0e5c) is now ready to be sponsored by a Committer.

@TheRealMDoerr
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented May 29, 2024

Going to push as commit 2d834b3.
Since your change was applied there have been 214 commits pushed to the master branch:

  • 787cf27: 8265919: RunThese30M fails "assert((!(((((JfrTraceIdBits::load(value)) & ((1 << 4) << 8)) != 0))))) failed: invariant"
  • 24aa1e1: 8313873: java/nio/channels/DatagramChannel/SendReceiveMaxSize.java fails on AIX due to small default RCVBUF size and different IPv6 Header interpretation
  • cc3f0e5: 8308144: Uncontrolled memory consumption in SSLFlowDelegate.Reader
  • 1ead7a7: 8331265: Bump update version for OpenJDK: jdk-17.0.13
  • c9d83d3: 8325203: System.exit(0) kills the launched 3rd party application
  • 0cfee92: 8294699: Launcher causes lingering busy cursor
  • f4da0e7: 8329223: Parallel: Parallel GC resizes heap even if -Xms = -Xmx
  • d1e31f6: 8289643: File descriptor leak with ProcessBuilder.startPipeline
  • 69e6736: 8314835: gtest wrappers should be marked as flagless
  • 6c3a188: 8320681: [macos] Test tools/jpackage/macosx/MacAppStoreJlinkOptionsTest.java timed out on macOS
  • ... and 204 more: https://git.openjdk.org/jdk17u-dev/compare/f221ff38300b5513a06e5755469668ef83556a3a...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 29, 2024
@openjdk openjdk bot closed this May 29, 2024
@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 May 29, 2024
@openjdk
Copy link

openjdk bot commented May 29, 2024

@TheRealMDoerr @yanglong1010 Pushed as commit 2d834b3.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@yanglong1010
Copy link
Contributor Author

Thank you all ~

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.

4 participants