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

8286707: JFR: Don't commit JFR internal jdk.JavaMonitorWait events #1044

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 9, 2023

I backport this for parity with 17.0.7-oracle.

I had to resolve jfrIntrinsics.hpp due to context.


Progress

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

Issue

  • JDK-8286707: JFR: Don't commit JFR internal jdk.JavaMonitorWait events

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1044

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 9, 2023

👋 Welcome back goetz! 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 fc889577eaf3f564d896818c1d9b1eb6fa5a8758 8286707: JFR: Don't commit JFR internal jdk.JavaMonitorWait events Jan 9, 2023
@openjdk
Copy link

openjdk bot commented Jan 9, 2023

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

@openjdk
Copy link

openjdk bot commented Jan 9, 2023

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

8286707: JFR: Don't commit JFR internal jdk.JavaMonitorWait events

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 9, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 9, 2023

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Jan 11, 2023

Pre-submit failure: estMetaspacePerfCounters.java#id3, this is known to fail once in a while. Didn't see it for a long time, though. But unrelated.

@GoeLin
Copy link
Member Author

GoeLin commented Jan 12, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jan 12, 2023

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

  • eceb480: 8267038: Update IANA Language Subtag Registry to Version 2022-03-02
  • ffecc39: 8295788: C2 compilation hits "assert((mode == ControlAroundStripMined && use == sfpt) || !use->is_reachable_from_root()) failed: missed a node"
  • 520ae87: 8284165: Add pid to process reaper thread name
  • 3722edc: 8284726: Print active locale settings in hs_err reports and in VM.info
  • 2defeb0: 8290067: Show stack dimensions in UL logging when attaching threads
  • 072bdfb: 8297523: Various GetPrimitiveArrayCritical miss result - NULL check
  • fea3818: 8280784: VM_Cleanup unnecessarily processes all thread oops
  • f2c3f35: 8297088: Update LCMS to 2.14
  • 1dc6a38: 8277822: Remove debug-only heap overrun checks in os::malloc and friends
  • c370dec: 8298271: java/security/SignedJar/spi-calendar-provider/TestSPISigned.java failing on Windows

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 12, 2023

@GoeLin Pushed as commit 0db4add.

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

@GoeLin GoeLin deleted the goetz_backport_8286707 branch January 12, 2023 14:02
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
1 participant