Skip to content

Conversation

@dchuyko
Copy link
Member

@dchuyko dchuyko commented Nov 24, 2023

On 17u JFR sometimes continues to sample threads after recordings are closed. In particular that happens on Linux aarch64 when JFR streaming is used and only jdk.ExecutionSample event is enabled. Symptoms:

[76.403s][debug][jfr      ] Recording "Recording Stream: 2023-11-21T14:57:07.651509569Z" (2) added chunk /tmp/2023_11_21_14_56_06_9044/2023_11_21_14_57_07.jfr, current size=4397790
[76.404s][trace][jfr      ] Disenrolling thread sampler
[76.404s][trace][jfr      ] Enrolling thread sampler
[76.404s][trace][jfr      ] Updated thread sampler for java: 1  ms, native 0 ms

This fix cures that enrolling after disenrolling. I'm not sure if related JDK-8295274 should be backported as well.

The patch was mostly applied cleanly but few hunks were replicated by hand without changes in their code.

Testing: tier1, tier2, jdk_jfr, gc/stress/jfr on (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-8288663 needs maintainer approval

Issue

  • JDK-8288663: JFR: Disabling the JfrThreadSampler commits only a partially disabled state (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1986

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 24, 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 a7df5a40639a4d3138616c9fc1b144381240d2e5 8288663: JFR: Disabling the JfrThreadSampler commits only a partially disabled state Nov 24, 2023
@openjdk
Copy link

openjdk bot commented Nov 24, 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 24, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 24, 2023

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

I'd backport JDK-8295274 too.

@openjdk
Copy link

openjdk bot commented Nov 27, 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 28, 2023
@openjdk
Copy link

openjdk bot commented Nov 29, 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:

8288663: JFR: Disabling the JfrThreadSampler commits only a partially disabled state

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

  • 8bf03b9: 8320363: ppc64 TypeEntries::type_unknown logic looks wrong, missed optimization opportunity
  • bf0fb69: 8320885: Bump update version for OpenJDK: jdk-17.0.11
  • 9165f77: 8271566: DSA signature length value is not accurate in P11Signature
  • cd52f99: 8275509: ModuleDescriptor.hashCode isn't reproducible across builds
  • 410b893: 8319187: Add three eMudhra emSign roots
  • 04ac9fe: 8315692: Parallelize gc/stress/TestStressRSetCoarsening.java test
  • 9128c89: 8277307: Pre shared key sent under both session_ticket and pre_shared_key extensions
  • 770b3d6: 8320209: VectorMaskGen clobbers rflags on x86_64

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 Nov 29, 2023
@dchuyko
Copy link
Member Author

dchuyko commented Nov 29, 2023

/integrate

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

openjdk bot commented Nov 29, 2023

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

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Nov 29, 2023

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

  • 8bf03b9: 8320363: ppc64 TypeEntries::type_unknown logic looks wrong, missed optimization opportunity
  • bf0fb69: 8320885: Bump update version for OpenJDK: jdk-17.0.11
  • 9165f77: 8271566: DSA signature length value is not accurate in P11Signature
  • cd52f99: 8275509: ModuleDescriptor.hashCode isn't reproducible across builds
  • 410b893: 8319187: Add three eMudhra emSign roots
  • 04ac9fe: 8315692: Parallelize gc/stress/TestStressRSetCoarsening.java test
  • 9128c89: 8277307: Pre shared key sent under both session_ticket and pre_shared_key extensions
  • 770b3d6: 8320209: VectorMaskGen clobbers rflags on x86_64

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 29, 2023

@phohensee @dchuyko Pushed as commit a8ea3c2.

💡 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.

2 participants