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

8272651: G1 heap region info print order changed by JDK-8269914 #2261

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 1, 2024

I backport this as prerequisite for 8291753 as proposed before in #1900.
The backport has been tested by releaseing it in SapMachine in 17.0.10. This patch here is identical to the one in SapMachine. It will go to 17.0.12 giving enough time to settle.

Also, this will bring G1 code of 17 closer to head probably simplifying further backports.

src/hotspot/share/gc/g1/g1CollectedHeap.cpp

Some lines removed are not in 17:

  • set_young_collection_default_active_worker_threads();
    some later:
  • G1YoungGCNotifyPauseMark npm;

These are added again a bit further down.

As adding them would modify the behaviour, I only added
them uncommented.

test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsLog.java
The file already has the correct coding. Obviously these lines
were changed after 17 and later reverted again.


Progress

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

Issue

  • JDK-8272651: G1 heap region info print order changed by JDK-8269914 (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2261

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 1, 2024

👋 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 f11e099a149adfecc474ba37276ec8672067d090 8272651: G1 heap region info print order changed by JDK-8269914 Mar 1, 2024
@openjdk
Copy link

openjdk bot commented Mar 1, 2024

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 Mar 1, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 1, 2024

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Mar 1, 2024

GHA failure: Well known Risk-V build issue. Unrelated.

@openjdk
Copy link

openjdk bot commented Mar 4, 2024

⚠️ @GoeLin 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 label Mar 5, 2024
@openjdk
Copy link

openjdk bot commented Mar 5, 2024

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

8272651: G1 heap region info print order changed by JDK-8269914

Reviewed-by: rrich

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

  • f3e90af: 8324824: AArch64: Detect Ampere-1B core and update default options for Ampere CPUs
  • bfe8974: 8323519: Add applications/ctw/modules to Hotspot tiered testing
  • 3add2e3: 8272903: Missing license header in ArenaAllocator.java
  • ab602af: 8323210: Update the usage of cmsFLAGS_COPY_ALPHA

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 and removed approval labels Mar 5, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Mar 5, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 5, 2024

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

  • f3e90af: 8324824: AArch64: Detect Ampere-1B core and update default options for Ampere CPUs
  • bfe8974: 8323519: Add applications/ctw/modules to Hotspot tiered testing
  • 3add2e3: 8272903: Missing license header in ArenaAllocator.java
  • ab602af: 8323210: Update the usage of cmsFLAGS_COPY_ALPHA

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 5, 2024

@GoeLin Pushed as commit 158f91a.

💡 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_8272651 branch March 5, 2024 11:56
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