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

8298341: Ensure heap growth in TestNativeMemoryUsageEvents.java #11579

Closed
wants to merge 1 commit into from

Conversation

kstefanj
Copy link
Contributor

@kstefanj kstefanj commented Dec 8, 2022

Please review this test fix.

Summary
The new test TestNativeMemoryUsageEvents.java sometimes fail. The reason is that the NativeMemoryUsage and NativeMemoryUsageTotal events want to share a single NMTUsage snapshot. To achieve this there is an AgeThreshold set to 50ms that is considered when sending the events. If the usage snapshot is new enough we don't refresh it, but reuse it. In the test this becomes problematic if the recording is shorter than 50ms, then both the beginChunk event and the endChunk event will use the same NMT data.

This could be solved by using the feature currently reviewed in #11541 and this is the plan, see: JDK-8298276. But since this is not yet done, I propose to fix the test for now by just adding a short sleep during the recording to ensure the endChunk event is delayed enough to cause a new NMT snapshot to be taken.

Testing

  • Local testing with a larger AgeThreshold to see that a sleep really helps the problem.
  • Mach5 testing to verify the fix is good there as well, this is currently running.

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

Issue

  • JDK-8298341: Ensure heap growth in TestNativeMemoryUsageEvents.java

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/11579/head:pull/11579
$ git checkout pull/11579

Update a local copy of the PR:
$ git checkout pull/11579
$ git pull https://git.openjdk.org/jdk pull/11579/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11579

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/11579.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 8, 2022

👋 Welcome back sjohanss! 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 added the rfr Pull request is ready for review label Dec 8, 2022
@openjdk
Copy link

openjdk bot commented Dec 8, 2022

@kstefanj The following label will be automatically applied to this pull request:

  • hotspot-jfr

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot-jfr hotspot-jfr-dev@openjdk.org label Dec 8, 2022
@mlbridge
Copy link

mlbridge bot commented Dec 8, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Dec 8, 2022

@kstefanj 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:

8298341: Ensure heap growth in TestNativeMemoryUsageEvents.java

Reviewed-by: egahlin, stuefe

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

  • 1166c8e: 8296896: Change virtual Thread.yield to use external submit
  • 5175965: 8298323: trivial typo in JOptionPane.OK_OPTION

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 Dec 8, 2022
@kstefanj
Copy link
Contributor Author

kstefanj commented Dec 8, 2022

Mach5 testing looks good, I plan to push this without waiting 24h to get rid of the CI noise.

Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

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

+1

@kstefanj
Copy link
Contributor Author

kstefanj commented Dec 8, 2022

Thanks @egahlin and @tstuefe for the quick reviews.
/integrate

@openjdk
Copy link

openjdk bot commented Dec 8, 2022

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

  • 1166c8e: 8296896: Change virtual Thread.yield to use external submit
  • 5175965: 8298323: trivial typo in JOptionPane.OK_OPTION

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 8, 2022

@kstefanj Pushed as commit 46cd457.

💡 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
hotspot-jfr hotspot-jfr-dev@openjdk.org integrated Pull request has been integrated
3 participants