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

8286740: JFR: Active Setting event emitted incorrectly #2210

Closed
wants to merge 1 commit into from

Conversation

richardstartin
Copy link
Contributor

@richardstartin richardstartin commented Feb 16, 2024

jtreg_jfr passed here


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-8286740 needs maintainer approval

Issue

  • JDK-8286740: JFR: Active Setting event emitted incorrectly (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2210

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 16, 2024

👋 Welcome back richardstartin! 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 24cab0af32a1eaa4c594fb2a144386a6b7062981 8286740: JFR: Active Setting event emitted incorrectly Feb 16, 2024
@openjdk
Copy link

openjdk bot commented Feb 16, 2024

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

@openjdk openjdk bot added the backport label Feb 16, 2024
@richardstartin richardstartin marked this pull request as ready for review February 16, 2024 09:49
@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 16, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 16, 2024

Webrevs

Copy link

@jbachorik jbachorik left a comment

Choose a reason for hiding this comment

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

I cross-checked the diff against the original fix and the only minor difference is MetadataRepository.java where configuration.getEventControl() was changed to handler.getEventControl().

LGTM

@openjdk
Copy link

openjdk bot commented Feb 19, 2024

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

@richardstartin
Copy link
Contributor Author

/approval 8286740 request

@openjdk
Copy link

openjdk bot commented Feb 19, 2024

@richardstartin
8286740: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Feb 19, 2024
@GoeLin
Copy link
Member

GoeLin commented Feb 21, 2024

@openjdk openjdk bot added approval and removed approval labels Feb 21, 2024
@GoeLin
Copy link
Member

GoeLin commented Feb 23, 2024

@richardstartin How did you test this?
I would like to delay this to the July update, can you please label again after 27.2.?

@openjdk openjdk bot removed the approval label Feb 23, 2024
@richardstartin
Copy link
Contributor Author

@richardstartin How did you test this? I would like to delay this to the July update, can you please label again after 27.2.?

As mentioned above, we ran the linked JFR jtreg tests, which pass.

@openjdk openjdk bot added the approval label Mar 13, 2024
@openjdk
Copy link

openjdk bot commented Mar 13, 2024

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

8286740: JFR: Active Setting event emitted incorrectly

Reviewed-by: jbachorik

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

  • c9b0307: 8268974: GetJREPath() JLI function fails to locate libjava.so if not standard Java launcher is used
  • 0b20589: 8324238: [macOS] java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java fails with the shape has not been applied msg
  • 27cf2f4: 8320943: Files/probeContentType/Basic.java fails on latest Windows 11 - content type mismatch
  • 6488725: 8324598: use mem_unit when working with sysinfo memory and swap related information
  • 02ef1c7: 8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64
  • 09ebd1c: 8320129: "top" command during jtreg failure handler does not display CPU usage on OSX
  • 49c260d: 8315898: Open source swing JMenu tests
  • b632518: 8299858: [Metrics] Swap memory limit reported incorrectly when too large
  • 3433fdb: 8314283: Support for NSS tests on aarch64 platforms
  • 0606e5a: 8326891: Prefer RPATH over RUNPATH for $ORIGIN rpaths in internal JDK binaries
  • ... and 67 more: https://git.openjdk.org/jdk17u-dev/compare/a234b7c0edd2caf482089a32a63ae79a423e3687...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 (@jbachorik) 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).

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Mar 14, 2024
@jbachorik
Copy link

/integrate

@openjdk
Copy link

openjdk bot commented Mar 14, 2024

@jbachorik Only the author (@richardstartin) is allowed to issue the integrate command.

@richardstartin
Copy link
Contributor Author

/integrate

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

openjdk bot commented Mar 14, 2024

@richardstartin
Your change (at version c88231a) is now ready to be sponsored by a Committer.

@jbachorik
Copy link

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 14, 2024

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

  • c9b0307: 8268974: GetJREPath() JLI function fails to locate libjava.so if not standard Java launcher is used
  • 0b20589: 8324238: [macOS] java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java fails with the shape has not been applied msg
  • 27cf2f4: 8320943: Files/probeContentType/Basic.java fails on latest Windows 11 - content type mismatch
  • 6488725: 8324598: use mem_unit when working with sysinfo memory and swap related information
  • 02ef1c7: 8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64
  • 09ebd1c: 8320129: "top" command during jtreg failure handler does not display CPU usage on OSX
  • 49c260d: 8315898: Open source swing JMenu tests
  • b632518: 8299858: [Metrics] Swap memory limit reported incorrectly when too large
  • 3433fdb: 8314283: Support for NSS tests on aarch64 platforms
  • 0606e5a: 8326891: Prefer RPATH over RUNPATH for $ORIGIN rpaths in internal JDK binaries
  • ... and 67 more: https://git.openjdk.org/jdk17u-dev/compare/a234b7c0edd2caf482089a32a63ae79a423e3687...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 14, 2024

@jbachorik @richardstartin Pushed as commit 4b9ab0d.

💡 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 integrated Pull request has been integrated
3 participants