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

8304074: [JMX] Add an approximation of total bytes allocated on the Java heap by the JVM #1971

Closed
wants to merge 5 commits into from

Conversation

phohensee
Copy link
Member

@phohensee phohensee commented Nov 19, 2023

I'd like to backport the definition and implementation of com.sun.management.ThreadMXBean.getTotalThreadAllocatedBytes to 17u. The backport CSR is JDK-8320375. A follow-up bugfix backport of JDK-8313081 will be done following this backport. The combined backports have been in production at Amazon for two months with no issues. The backport uses the reserved6 slot in jmm.h in order to preserve binary compatibility with 17u. Per current policy, there is no update to JMM_VERSION in jmm.h and the new method is marked

@since 17.0.11

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change requires CSR request JDK-8320375 to be approved
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8304074 needs maintainer approval

Issues

  • JDK-8304074: [JMX] Add an approximation of total bytes allocated on the Java heap by the JVM (Enhancement - P4 - Approved)
  • JDK-8320375: [JMX] Add an approximation of total bytes allocated on the Java heap by the JVM (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1971

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

Using diff file

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

Webrev

Link to Webrev Comment

@phohensee phohensee changed the title Backport 8304074 Backport 3eced01f9efe2567a07b63343f8559683a2d0517 Nov 19, 2023
@bridgekeeper
Copy link

bridgekeeper bot commented Nov 19, 2023

👋 Welcome back phh! 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 3eced01f9efe2567a07b63343f8559683a2d0517 8304074: [JMX] Add an approximation of total bytes allocated on the Java heap by the JVM Nov 19, 2023
@openjdk
Copy link

openjdk bot commented Nov 19, 2023

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

@openjdk openjdk bot added backport csr Pull request needs approved CSR before integration rfr Pull request is ready for review labels Nov 19, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 19, 2023

Webrevs

Copy link
Member

@simonis simonis left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks for doing the downport.

@phohensee
Copy link
Member Author

Thanks for the quick review of both this PR and the CSR. Now waiting on CSR approval.

Copy link
Member

@simonis simonis left a comment

Choose a reason for hiding this comment

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

Thanks for updating the since tag. Still good.

@openjdk
Copy link

openjdk bot commented Dec 5, 2023

⚠️ @phohensee 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 removed the csr Pull request needs approved CSR before integration label Dec 5, 2023
@phohensee
Copy link
Member Author

/approval request Almost clean backport of purely additive JMX feature (doesn't change existing code). In production at Amazon for over two months.

@openjdk
Copy link

openjdk bot commented Dec 6, 2023

@phohensee
8304074: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Dec 6, 2023
@openjdk
Copy link

openjdk bot commented Dec 7, 2023

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

8304074: [JMX] Add an approximation of total bytes allocated on the Java heap by the JVM

Reviewed-by: simonis

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

  • 16f319a: 8307990: jspawnhelper must close its writing side of a pipe before reading from it
  • 0bc91f6: 8313643: Update HarfBuzz to 8.2.2
  • 450c201: 8319961: JvmtiEnvBase doesn't zero _ext_event_callbacks
  • 5025a97: 8312434: SPECjvm2008/xml.transform with CDS fails with "can't seal package nu.xom"
  • be72703: 8301306: java/net/httpclient/* fail with -Xcomp
  • f8f733d: Merge
  • b78a848: 8320601: ProblemList java/lang/invoke/lambda/LambdaFileEncodingSerialization.java on linux-all
  • a028120: 8269258: java/net/httpclient/ManyRequestsLegacy.java failed with connection timeout
  • 2a019da: 8301846: Invalid TargetDataLine after screen lock when using JFileChooser or COM library
  • ce670b6: 8318951: Additional negative value check in JPEG decoding
  • ... and 26 more: https://git.openjdk.org/jdk17u-dev/compare/40c29f7d80b5b67718ce071722bd7cfaecdf9495...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.

➡️ 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 and removed approval labels Dec 7, 2023
@phohensee
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 7, 2023

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

  • 9bf8c2e: 8311645: Memory leak in jspawnhelper spawnChild after JDK-8307990
  • af0f057: 8310106: sun.security.ssl.SSLHandshake.getHandshakeProducer() incorrectly checks handshakeConsumers
  • 7b51211: 7148092: [macosx] When Alt+down arrow key is pressed, the combobox popup does not appear.
  • 644a430: 8054572: [macosx] JComboBox paints the border incorrectly
  • 5217b07: 8290399: [macos] Aqua LAF does not fire an action event if combo box menu is displayed
  • 4d716cc: 7132796: [macosx] closed/javax/swing/JComboBox/4517214/bug4517214.java fails on MacOS
  • 16f319a: 8307990: jspawnhelper must close its writing side of a pipe before reading from it
  • 0bc91f6: 8313643: Update HarfBuzz to 8.2.2
  • 450c201: 8319961: JvmtiEnvBase doesn't zero _ext_event_callbacks
  • 5025a97: 8312434: SPECjvm2008/xml.transform with CDS fails with "can't seal package nu.xom"
  • ... and 32 more: https://git.openjdk.org/jdk17u-dev/compare/40c29f7d80b5b67718ce071722bd7cfaecdf9495...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 7, 2023

@phohensee Pushed as commit 0bbbd14.

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

@phohensee phohensee deleted the backport-8304074 branch December 14, 2023 21:35
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
Development

Successfully merging this pull request may close these issues.

2 participants