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

8316319: Generational ZGC: The SoftMaxHeapSize might be wrong when CDS decreases the MaxHeapSize #126

Closed
wants to merge 3 commits into from

Conversation

yaqsun
Copy link
Contributor

@yaqsun yaqsun commented Jan 4, 2024

runtime/cds/appcds/TestZGCWithCDS.java#ZGenerational failed, we want to make the test pass.
Patch can be applied cleanly.
Low risk.
And test have been locally verified to pass.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8316319 needs maintainer approval

Issue

  • JDK-8316319: Generational ZGC: The SoftMaxHeapSize might be wrong when CDS decreases the MaxHeapSize (Bug - P3 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 126

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 4, 2024

👋 Welcome back yaqsun! 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 fe862639e7ce40f5adef0e482b1fb9c718e061a3 8316319: Generational ZGC: The SoftMaxHeapSize might be wrong when CDS decreases the MaxHeapSize Jan 4, 2024
@openjdk
Copy link

openjdk bot commented Jan 4, 2024

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

@openjdk
Copy link

openjdk bot commented Jan 4, 2024

⚠️ @yaqsun 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 rfr Pull request is ready for review label Jan 4, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 4, 2024

Webrevs

@shipilev
Copy link
Member

shipilev commented Jan 8, 2024

It looks fine, but you need to go to https://github.com/yaqsun/jdk21u-dev/actions, enable the testing workflow, and kick off the test run. Then apply for maintainer approval, like bot above says.

@yaqsun
Copy link
Contributor Author

yaqsun commented Jan 9, 2024

/approval

@openjdk
Copy link

openjdk bot commented Jan 9, 2024

@yaqsun usage: /approval [<id>] (request|cancel) [<text>]

@yaqsun
Copy link
Contributor Author

yaqsun commented Jan 9, 2024

/approval 8316319 request

@openjdk
Copy link

openjdk bot commented Jan 9, 2024

@yaqsun
8316319: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Jan 9, 2024
@openjdk openjdk bot removed the clean label Jan 9, 2024
@openjdk openjdk bot added the clean label Jan 9, 2024
@GoeLin
Copy link
Member

GoeLin commented Jan 9, 2024

Hi,
your approval request is not complete.
Please list reason, risk, testing and whether
the backport was clean. See also
https://wiki.openjdk.org/display/JDKUpdates/How+to+contribute+or+backport+a+fix "Example Fix Request comment".
Removing label in the meantime.

@yaqsun
Copy link
Contributor Author

yaqsun commented Jan 18, 2024

/approval 8316319 request

@openjdk
Copy link

openjdk bot commented Jan 18, 2024

@yaqsun
8316319: The approval request was already up to date.

@openjdk openjdk bot added the approval label Jan 18, 2024
@openjdk
Copy link

openjdk bot commented Jan 22, 2024

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

8316319: Generational ZGC: The SoftMaxHeapSize might be wrong when CDS decreases the MaxHeapSize

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

  • ada400c: 8318158: RISC-V: implement roundD/roundF intrinsics
  • 1dd2f2a: 8169475: WheelModifier.java fails by timeout
  • e9be531: 8077371: Binary files in JAXP test should be removed
  • 69416f4: 8318809: java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java shows intermittent failures on linux ppc64le and aarch64
  • c01bdbb: 8314283: Support for NSS tests on aarch64 platforms
  • c3657ee: 8317771: [macos14] Expand/collapse a JTree using keyboard freezes the application in macOS 14 Sonoma
  • 95e36bc: 8322279: Generational ZGC: Use ZFragmentationLimit and ZYoungCompactionLimit as percentage instead of multiples
  • 6443937: 8323008: filter out harmful -std* flags added by autoconf from CXX
  • c8f0418: 8310031: Parallel: Implement better work distribution for large object arrays in old gen
  • 0d30c8d: 8318590: JButton ignores margin when painting HTML text
  • ... and 108 more: https://git.openjdk.org/jdk21u-dev/compare/57b5147260464214122cb5200566c2b4d2889c75...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ 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 labels Jan 22, 2024
@shipilev
Copy link
Member

@yaqsun, I think you are ready to integrate.

@yaqsun
Copy link
Contributor Author

yaqsun commented Jan 23, 2024

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jan 23, 2024
@openjdk
Copy link

openjdk bot commented Jan 23, 2024

@yaqsun
Your change (at version 7d5588a) is now ready to be sponsored by a Committer.

@shipilev
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jan 23, 2024

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

  • 2697a9d: 8318696: Do not use LFS64 symbols on Linux
  • 1f9b03e: 8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64
  • be8733b: 8319213: Compatibility.java reads both stdout and stderr of JdkUtils
  • fae1a03: 8312416: Tests in Locale should have more descriptive names
  • ada400c: 8318158: RISC-V: implement roundD/roundF intrinsics
  • 1dd2f2a: 8169475: WheelModifier.java fails by timeout
  • e9be531: 8077371: Binary files in JAXP test should be removed
  • 69416f4: 8318809: java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java shows intermittent failures on linux ppc64le and aarch64
  • c01bdbb: 8314283: Support for NSS tests on aarch64 platforms
  • c3657ee: 8317771: [macos14] Expand/collapse a JTree using keyboard freezes the application in macOS 14 Sonoma
  • ... and 112 more: https://git.openjdk.org/jdk21u-dev/compare/57b5147260464214122cb5200566c2b4d2889c75...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 23, 2024

@shipilev @yaqsun Pushed as commit 8084244.

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

Successfully merging this pull request may close these issues.

3 participants