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

8322142: JFR: Periodic tasks aren't orphaned between recordings #203

Closed
wants to merge 2 commits into from

Conversation

antonha
Copy link
Contributor

@antonha antonha commented Jan 22, 2024

Backport to fix https://bugs.openjdk.org/browse/JDK-8322142 for jdk21.

First time commiting to openjdk, so please pardon if this is the wrong approach to the PR. I followed instructions in https://wiki.openjdk.org/display/JDKUpdates/How+to+contribute+or+backport+a+fix - not sure if those are still valid for 21.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8322142 needs maintainer approval

Issue

  • JDK-8322142: JFR: Periodic tasks aren't orphaned between recordings (Bug - P2 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 203

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper bridgekeeper bot added the oca Needs verification of OCA signatory status label Jan 22, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented Jan 22, 2024

Hi @antonha, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user antonha" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

@openjdk openjdk bot changed the title Backport 1551928502c8ed96350e7b4f1316ea35587407fe 8322142: JFR: Periodic tasks aren't orphaned between recordings Jan 22, 2024
@openjdk
Copy link

openjdk bot commented Jan 22, 2024

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

@antonha
Copy link
Contributor Author

antonha commented Jan 22, 2024

/approval JDK-8322142 request This issue affects production flight recording rather severely, it would be useful to have the fix in 21 as well.

@openjdk
Copy link

openjdk bot commented Jan 22, 2024

@antonha
JDK-8322142: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Jan 22, 2024
@bridgekeeper bridgekeeper bot removed the oca Needs verification of OCA signatory status label Jan 23, 2024
@openjdk
Copy link

openjdk bot commented Jan 23, 2024

⚠️ @antonha 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.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 23, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 23, 2024

Webrevs

@jerboaa
Copy link
Contributor

jerboaa commented Jan 24, 2024

@antonha What testing have you done? Please enable GHA for your fork (minimum bar to get it integrated). Running JFR tests would be wise to do as well. Thanks!

@jerboaa
Copy link
Contributor

jerboaa commented Jan 24, 2024

The fix request comment didn't mention it so I'm removing the approval label for now. Please re-apply once that's present/fixed.

@openjdk openjdk bot removed the approval label Jan 24, 2024
@antonha
Copy link
Contributor Author

antonha commented Jan 25, 2024

@jerboaa Thanks - I did run the tier1 suite locally before creating the PR. I also enabled GHA for the for the fork, but did that after creating the PR so I don't think that it automatically triggered - I now triggered a run which seems to have passed: https://github.com/antonha/jdk21u-dev/actions/runs/7646727789

I'm not that familiar with the test suite so I don't quite know which JFR tests there are, but I did now try running the jdk/jfr tests using make run-test TEST=jdk/jfr for linux-x86_64-server-release and linux-x86_64-server-fastdebug locally, both pass with the same message:

==============================
Test summary
==============================
   TEST                                              TOTAL  PASS  FAIL ERROR   
   jtreg:test/jdk/jdk/jfr                              584   584     0     0   
==============================
TEST SUCCESS

Should I re-apply for approval now?

@jerboaa
Copy link
Contributor

jerboaa commented Jan 25, 2024

@antonha Thanks!

Should I re-apply for approval now?

Yes. Mention the testing you've done in the approval comment.

@antonha
Copy link
Contributor Author

antonha commented Jan 25, 2024

/approval JDK-8322142 request GHA sanity checks passed (https://github.com/antonha/jdk21u-dev/actions/runs/7646727789). make run-test TEST=jdk/jfr passes for linux-x86_64-server-release and linux-x86_64-server-fastdebug on my desktop.

@openjdk
Copy link

openjdk bot commented Jan 25, 2024

@antonha
JDK-8322142: The approval request has been updated successfully.

@openjdk openjdk bot added the approval label Jan 25, 2024
@openjdk
Copy link

openjdk bot commented Jan 26, 2024

⚠️ @antonha the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout JDK-8322142
$ git commit --author='Preferred Full Name <you@example.com>' --allow-empty -m 'Update full name'
$ git push

@openjdk
Copy link

openjdk bot commented Jan 26, 2024

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

8322142: JFR: Periodic tasks aren't orphaned between recordings

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

  • bf7c218: 8321480: ISO 4217 Amendment 176 Update
  • e2cabfe: 8316947: Write a test to check textArea triggers MouseEntered/MouseExited events properly
  • 2adc2b4: 8317535: Shenandoah: Remove unused code
  • 711ab38: 8322255: Generational ZGC: ZPageSizeMedium should be set before MaxTenuringThreshold
  • cc189ff: 8295343: sun/security/pkcs11 tests fail on Linux RHEL 8.6 and newer
  • e87638c: 8321122: Shenandoah: Remove ShenandoahLoopOptsAfterExpansion flag
  • 90d7b17: 8321120: Shenandoah: Remove ShenandoahElasticTLAB flag
  • 7fcfea5: 8324050: Issue store-store barrier after re-materializing objects during deoptimization
  • 34d97ab: 8321269: Require platforms to define DEFAULT_CACHE_LINE_SIZE
  • 63e52ed: 8318468: compiler/tiered/LevelTransitionTest.java fails with -XX:CompileThreshold=100 -XX:TieredStopAtLevel=1
  • ... and 11 more: https://git.openjdk.org/jdk21u-dev/compare/c01bdbbfb1784bff6ae4b66d156b3c78546ad264...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 and removed approval labels Jan 26, 2024
@jerboaa
Copy link
Contributor

jerboaa commented Jan 26, 2024

Thanks for the update. Fix request comment was better now. Affects JFR usage only => low risk with rather high impact. Approved.

@antonha
Copy link
Contributor Author

antonha commented Jan 26, 2024

/integrate

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

openjdk bot commented Jan 26, 2024

@antonha
Your change (at version 1ae511f) is now ready to be sponsored by a Committer.

@jerboaa
Copy link
Contributor

jerboaa commented Jan 26, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented Jan 26, 2024

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

  • bf7c218: 8321480: ISO 4217 Amendment 176 Update
  • e2cabfe: 8316947: Write a test to check textArea triggers MouseEntered/MouseExited events properly
  • 2adc2b4: 8317535: Shenandoah: Remove unused code
  • 711ab38: 8322255: Generational ZGC: ZPageSizeMedium should be set before MaxTenuringThreshold
  • cc189ff: 8295343: sun/security/pkcs11 tests fail on Linux RHEL 8.6 and newer
  • e87638c: 8321122: Shenandoah: Remove ShenandoahLoopOptsAfterExpansion flag
  • 90d7b17: 8321120: Shenandoah: Remove ShenandoahElasticTLAB flag
  • 7fcfea5: 8324050: Issue store-store barrier after re-materializing objects during deoptimization
  • 34d97ab: 8321269: Require platforms to define DEFAULT_CACHE_LINE_SIZE
  • 63e52ed: 8318468: compiler/tiered/LevelTransitionTest.java fails with -XX:CompileThreshold=100 -XX:TieredStopAtLevel=1
  • ... and 11 more: https://git.openjdk.org/jdk21u-dev/compare/c01bdbbfb1784bff6ae4b66d156b3c78546ad264...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 26, 2024

@jerboaa @antonha Pushed as commit a9498e5.

💡 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
2 participants