Skip to content

Conversation

@dchuyko
Copy link
Member

@dchuyko dchuyko commented Nov 29, 2023

This is an addition to #1986 and #1992
Having disabled events in recordings is also quite unexpected.

The patch is very close to the original one. jfrEvent.hpp is slightly different because of virtual threads absence (no JfrThreadLocal::is_included()), and ProblemList.txt in 17 doesn't contain TestActiveSettingEvent.

Testing: tier1, tier2, jdk_jfr, gc/stress/jfr (linux-aarch64 fastdebug).


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

Issue

  • JDK-8287832: jdk/jfr/event/runtime/TestActiveSettingEvent.java failed with "Expected two batches of Active Setting events" (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2002

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 29, 2023

👋 Welcome back dchuyko! 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 4df4a1f8e238ebf49d4b0e1e102ccdc3cdb82de9 8287832: jdk/jfr/event/runtime/TestActiveSettingEvent.java failed with "Expected two batches of Active Setting events" Nov 29, 2023
@openjdk
Copy link

openjdk bot commented Nov 29, 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 rfr Pull request is ready for review labels Nov 29, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 29, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Nov 30, 2023

⚠️ @dchuyko 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 approval Requires approval; will be removed when approval is received label Nov 30, 2023
@GoeLin
Copy link
Member

GoeLin commented Dec 1, 2023

/approve yes

@openjdk
Copy link

openjdk bot commented Dec 1, 2023

@GoeLin
8287832: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Dec 1, 2023

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

8287832: jdk/jfr/event/runtime/TestActiveSettingEvent.java failed with "Expected two batches of Active Setting events"

Reviewed-by: phh

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

  • 28e1a33: 8318736: com/sun/jdi/JdwpOnThrowTest.java failed with "transport error 202: bind failed: Address already in use"
  • 14e6812: 8317960: [17u] Excessive CPU usage on AbstractQueuedSynchronized.isEnqueued
  • 78cc634: 8295274: HelidonAppTest.java fails "assert(event->should_commit()) failed: invariant" from compiled frame"

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.

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 (@phohensee) 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 Requires approval; will be removed when approval is received labels Dec 1, 2023
@dchuyko
Copy link
Member Author

dchuyko commented Dec 1, 2023

/integrate

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

openjdk bot commented Dec 1, 2023

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

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 1, 2023

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

  • 56fc06c: 8317603: Improve exception messages thrown by sun.nio.ch.Net native methods (win)
  • 28e1a33: 8318736: com/sun/jdi/JdwpOnThrowTest.java failed with "transport error 202: bind failed: Address already in use"
  • 14e6812: 8317960: [17u] Excessive CPU usage on AbstractQueuedSynchronized.isEnqueued
  • 78cc634: 8295274: HelidonAppTest.java fails "assert(event->should_commit()) failed: invariant" from compiled frame"

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 1, 2023

@phohensee @dchuyko Pushed as commit e4cb6aa.

💡 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 Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants