Skip to content

Conversation

@olivergillespie
Copy link
Contributor

@olivergillespie olivergillespie commented May 15, 2023

Backport for 8307346

This would be clean, except 8280450 adds some inconsequential code immediately after the hunks in g1 and parallel for reporting task queue stats, which causes a trivial conflict.


Progress

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

Issue

  • JDK-8307346: Add missing gc+phases logging for ObjectCount(AfterGC) JFR event collection code

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1344

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 15, 2023

👋 Welcome back ogillespie! 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 3f1927a7f3a2914402a25335c47a5a8bdd5511a6 8307346: Add missing gc+phases logging for ObjectCount(AfterGC) JFR event collection code May 15, 2023
@openjdk
Copy link

openjdk bot commented May 15, 2023

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels May 15, 2023
@openjdk
Copy link

openjdk bot commented May 15, 2023

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

8307346: Add missing gc+phases logging for ObjectCount(AfterGC) JFR event collection code

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

  • 7610862: 8307425: Socket input stream read burns CPU cycles with back-to-back poll(0) calls
  • 1087e3b: 8306996: Open source Swing MenuItem related tests
  • bcb1f86: 8248001: javadoc generates invalid HTML pages whose ftp:// links are broken
  • f655ccd: 8304760: Add 2 Microsoft TLS roots
  • e55bea4: 8299544: Improve performance of CRC32C intrinsics (non-AVX-512) for small inputs
  • e7bac42: 8295974: jni_FatalError and Xcheck:jni warnings should print the native stack when there are no Java frames
  • 093f02a: 8305975: Add TWCA Global Root CA
  • bf7ceda: 8282201: Consider removal of expiry check in VerifyCACerts.java test
  • 398da7e: 8305088: SIGSEGV in Method::is_method_handle_intrinsic
  • 1970b63: 8304054: Linux: NullPointerException from FontConfiguration.getVersion in case no fonts are installed
  • ... and 7 more: https://git.openjdk.org/jdk17u-dev/compare/6a8497437ad11c8afbe7f02390ab5491a9390277...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 rfr Pull request is ready for review labels May 15, 2023
@mlbridge
Copy link

mlbridge bot commented May 15, 2023

Webrevs

@phohensee
Copy link
Member

Please enable pre-submit checks on this repo, and backport to 20u.

@olivergillespie
Copy link
Contributor Author

They're enabled now, but not sure how to re-trigger. Must 20 be done before 17?

@phohensee
Copy link
Member

You can request both 17 and 20 at the same time, so just post a 20u PR. I don't actually know how to provoke a pre-submit run, but I'd try a merging your branch with master.

@olivergillespie
Copy link
Contributor Author

Triggered the checks, and they're passing. The bug is approved for 17u backport. I created openjdk/jdk20u#79 for 20.

@phohensee
Copy link
Member

Please add a /integrate comment and I'll sponsor.

@olivergillespie
Copy link
Contributor Author

/integrate

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

openjdk bot commented May 17, 2023

@olivergillespie
Your change (at version 7cf18ee) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented May 17, 2023

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

  • 7610862: 8307425: Socket input stream read burns CPU cycles with back-to-back poll(0) calls
  • 1087e3b: 8306996: Open source Swing MenuItem related tests
  • bcb1f86: 8248001: javadoc generates invalid HTML pages whose ftp:// links are broken
  • f655ccd: 8304760: Add 2 Microsoft TLS roots
  • e55bea4: 8299544: Improve performance of CRC32C intrinsics (non-AVX-512) for small inputs
  • e7bac42: 8295974: jni_FatalError and Xcheck:jni warnings should print the native stack when there are no Java frames
  • 093f02a: 8305975: Add TWCA Global Root CA
  • bf7ceda: 8282201: Consider removal of expiry check in VerifyCACerts.java test
  • 398da7e: 8305088: SIGSEGV in Method::is_method_handle_intrinsic
  • 1970b63: 8304054: Linux: NullPointerException from FontConfiguration.getVersion in case no fonts are installed
  • ... and 7 more: https://git.openjdk.org/jdk17u-dev/compare/6a8497437ad11c8afbe7f02390ab5491a9390277...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 17, 2023

@phohensee @olivergillespie Pushed as commit 61c7351.

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

@olivergillespie olivergillespie deleted the olivergillespie-backport-3f1927a7 branch May 17, 2023 16:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants