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

8223575: add subspace transitions to gc+metaspace=info log lines #1126

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jun 7, 2022

I backport this for parity with 11.0.17-oracle.

src/hotspot/share/gc/shared/genCollectedHeap.cpp had to be resolved because it has a
somewhat different logic.

I had to port the change to Shenandoah.


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

Issue

  • JDK-8223575: add subspace transitions to gc+metaspace=info log lines

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/1126/head:pull/1126
$ git checkout pull/1126

Update a local copy of the PR:
$ git checkout pull/1126
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/1126/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1126

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/1126.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 7, 2022

👋 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 dacaff48e2545192e32bb441c15f40c3a7b587d2 8223575: add subspace transitions to gc+metaspace=info log lines Jun 7, 2022
@openjdk
Copy link

openjdk bot commented Jun 7, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jun 7, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 7, 2022

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Jun 9, 2022

Pre-submit failures: known windows problems, unrelated.

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for backporting. Please consider removing the extra newline before integrating.

@@ -591,6 +589,8 @@ void GenCollectedHeap::do_collection(bool full,
size_t young_prev_used = _young_gen->used();
size_t old_prev_used = _old_gen->used();

Copy link
Contributor

Choose a reason for hiding this comment

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

Upstream version doesn't have this empty line between old_prev_used and prev_meta_sizes.

@openjdk
Copy link

openjdk bot commented Jun 9, 2022

@GoeLin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8223575: add subspace transitions to gc+metaspace=info log lines

Reviewed-by: mdoerr

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

  • bb5d2bb: 8239902: [macos] Remove direct usage of JSlider, JProgressBar classes in CAccessible class
  • 16d0b7d: 8210107: vmTestbase/nsk/stress/network tests fail with Cannot assign requested address (Bind failed)
  • a665027: Merge
  • e996d6f: 8286855: javac error on invalid jar should only print filename
  • 9c64a06: 8286594: (zipfs) Mention paths with dot elements in ZipException and cleanups
  • 3f9d731: 8286444: javac errors after JDK-8251329 are not helpful enough to find root cause
  • 54a1784: 8287378: GHA: Update cygwin to fix issues in langtools tests on Windows
  • 3625ce7: 8287739: [11u] ProblemList sun/security/ssl/SSLSessionImpl/NoInvalidateSocketException.java
  • 4546db6: 8240132: ProblemList com/sun/jdi/InvokeHangTest.java
  • 06ead4e: 8274171: java/nio/file/Files/probeContentType/Basic.java failed on "Content type" mismatches

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 the ready Pull request is ready to be integrated label Jun 9, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Jun 10, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jun 10, 2022

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

  • 39109e5: 8209736: runtime/RedefineTests/ModifyAnonymous.java fails with NullPointerException when running in CDS mode
  • cc6137c: 8069343: Improve gc/g1/TestHumongousCodeCacheRoots.java to use jtreg @requires
  • a87bfb8: 8286114: [test] show real exception in bomb call in sun/rmi/runtime/Log/checkLogging/CheckLogging.java
  • bb5d2bb: 8239902: [macos] Remove direct usage of JSlider, JProgressBar classes in CAccessible class
  • 16d0b7d: 8210107: vmTestbase/nsk/stress/network tests fail with Cannot assign requested address (Bind failed)
  • a665027: Merge
  • e996d6f: 8286855: javac error on invalid jar should only print filename
  • 9c64a06: 8286594: (zipfs) Mention paths with dot elements in ZipException and cleanups
  • 3f9d731: 8286444: javac errors after JDK-8251329 are not helpful enough to find root cause
  • 54a1784: 8287378: GHA: Update cygwin to fix issues in langtools tests on Windows
  • ... and 3 more: https://git.openjdk.org/jdk11u-dev/compare/f915a327b9bd6855bdb30c2b6c8358da3973483b...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 10, 2022

@GoeLin Pushed as commit bf0ebd2.

💡 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_8223575 branch June 10, 2022 09:49
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
2 participants