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

8301842: JFR: increase checkpoint event size for stacktrace and string pool #1173

Closed
wants to merge 1 commit into from

Conversation

kvergizova
Copy link

@kvergizova kvergizova commented Feb 14, 2023

I'd like to backport JDK-8301842 as a small follow up fix for JDK-8298129 which is already included in 17u.
The patch applies cleanly.
Tested with tier1 and jdk/jfr.


Progress

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

Issue

  • JDK-8301842: JFR: increase checkpoint event size for stacktrace and string pool

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1173

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 14, 2023

👋 Welcome back evergizova! 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 7dfe75cf553193faf709cff6b8b2505680d7cebc 8301842: JFR: increase checkpoint event size for stacktrace and string pool Feb 14, 2023
@openjdk
Copy link

openjdk bot commented Feb 14, 2023

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

@openjdk
Copy link

openjdk bot commented Feb 14, 2023

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

8301842: JFR: increase checkpoint event size for stacktrace and string pool

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

  • 8b30968: 8300205: Swing test bug8078268 make latch timeout configurable
  • 17084d5: 8299957: Enhance error logging in instrument coding with additional jplis_assert_msg

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.

➡️ 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 Feb 14, 2023
@mlbridge
Copy link

mlbridge bot commented Feb 14, 2023

Webrevs

@egahlin
Copy link
Member

egahlin commented Feb 14, 2023

Have you tried to open .jfr files with earlier versions of JMC?

I tried "jfr print" with JDK 11, and it still works for u4 sized events, but it would be good to confirm it also works with JMC 7 since it uses a different parser than the JDK.

@kvergizova
Copy link
Author

I successfully opened new .jfr files with JMC 7.0.0.
As I can see it reads checkpoint size as readInt():
https://hg.openjdk.java.net/jmc/jmc7/file/63ec7d0ee8d9/core/org.openjdk.jmc.flightrecorder/src/main/java/org/openjdk/jmc/flightrecorder/internal/parser/v1/ChunkLoaderV1.java#l100
and readInt() calls readCompressedLong():
https://hg.openjdk.java.net/jmc/jmc7/file/63ec7d0ee8d9/core/org.openjdk.jmc.flightrecorder/src/main/java/org/openjdk/jmc/flightrecorder/internal/parser/v1/SeekableInputStream.java#l236

So it still works for u4 sized events.

@kvergizova
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Feb 16, 2023

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

  • cf5490b: 8297437: javadoc cannot link to old docs (with old style anchors)
  • 334ec9a: 8282958: Rendering Issues with Borders on Windows High-DPI systems
  • d2409a7: 8295777: java/net/httpclient/ConnectExceptionTest.java should not rely on system resolver
  • 0ce70e3: 8294958: java/net/httpclient/ConnectTimeout tests are slow
  • efe8676: 8279614: The left line of the TitledBorder is not painted on 150 scale factor
  • 036029e: 8281170: Test jdk/tools/jpackage/windows/WinInstallerIconTest always fails on Windows 11
  • 9e26f38: 8300266: Detect Virtualization on Linux aarch64
  • 68d7ac5: 8288415: java/awt/PopupMenu/PopupMenuLocation.java is unstable in MacOS machines
  • 8b30968: 8300205: Swing test bug8078268 make latch timeout configurable
  • 17084d5: 8299957: Enhance error logging in instrument coding with additional jplis_assert_msg

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 16, 2023

@kvergizova Pushed as commit fb6d6fe.

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