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

8276796: gc/TestSystemGC.java large pages subtest fails with ZGC #6310

Closed
wants to merge 3 commits into from

Conversation

shipilev
Copy link
Contributor

@shipilev shipilev commented Nov 9, 2021

ZGC would not start when it cannot allocate the heap with -XX:+UseLargePages. This makes the UseLargePages subtest fail on systems with (default) nr_hugepages = 0. It was exposed after JDK-8269077 moved that test config from G1-specific to generic one.

While fixing this bug, I decided to massage a test a bit: make it consistently choosing the configuration based on GC availability, doing UseLargePages tests only for GCs that fall back to non-large pages if not available, added test IDs. This basically goes the other way JDK-8269077 went: put in the GC-specific configs.

Additional testing:

  • Linux x86_64 fastdebug, gc/TestSystemGC.java (runs all 5 configs)
  • Linux x86_64 fastdebug, gc/TestSystemGC.java, TEST_VM_OPTS=-XX:+UseSerialGC (runs 1 config)
  • Linux x86_64 fastdebug, gc/TestSystemGC.java, TEST_VM_OPTS=-XX:+UseParallelGC (runs 1 config)
  • Linux x86_64 fastdebug, gc/TestSystemGC.java, TEST_VM_OPTS=-XX:+UseG1GC (runs 1 config)
  • Linux x86_64 fastdebug, gc/TestSystemGC.java, TEST_VM_OPTS=-XX:+UseShenandoahGC (runs 1 config)
  • Linux x86_64 fastdebug, gc/TestSystemGC.java, TEST_VM_OPTS=-XX:+UseZGC (runs 1 config)

Progress

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

Issue

  • JDK-8276796: gc/TestSystemGC.java large pages subtest fails with ZGC

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6310/head:pull/6310
$ git checkout pull/6310

Update a local copy of the PR:
$ git checkout pull/6310
$ git pull https://git.openjdk.java.net/jdk pull/6310/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6310

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6310.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 9, 2021

👋 Welcome back shade! 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 added the rfr label Nov 9, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 9, 2021

@shipilev The following label will be automatically applied to this pull request:

  • hotspot-gc

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot-gc label Nov 9, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 9, 2021

Webrevs

pliden
pliden approved these changes Nov 9, 2021
Copy link
Contributor

@pliden pliden left a comment

Looks good.

@openjdk
Copy link

@openjdk openjdk bot commented Nov 9, 2021

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

8276796: gc/TestSystemGC.java large pages subtest fails with ZGC

Reviewed-by: pliden, stefank

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:

  • a0b8445: 8276846: JDK-8273416 is incomplete for UseSSE=1
  • a3f710e: 8276215: Intrinsics matchers should handle native method flags better

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 label Nov 9, 2021
Copy link
Member

@stefank stefank left a comment

Looks like a sensible fix.

test/hotspot/jtreg/gc/TestSystemGC.java Outdated Show resolved Hide resolved
test/hotspot/jtreg/gc/TestSystemGC.java Outdated Show resolved Hide resolved
stefank
stefank approved these changes Nov 9, 2021
pliden
pliden approved these changes Nov 10, 2021
@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Nov 10, 2021

Thanks for reviews. I'll do another merge to pick up Windows x86_64 GHA fixes to make sure this still works properly on Windows, and then push.

@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Nov 11, 2021

GHA tests are green.

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 11, 2021

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

  • 08e0fd6: 8276835: G1: make G1EvacFailureObjectsSet::record inline
  • ad3be04: 8276536: Update TimeZoneNames files to follow the changes made by JDK-8275766
  • e27a67a: 8276930: Update ProblemList
  • 73e6d7d: 8276801: gc/stress/CriticalNativeStress.java fails intermittently with Shenandoah
  • bce35ac: 8276775: ZonedDateTime/OffsetDateTime.toString return invalid ISO-8601 for years <= 1893
  • 0c409ca: 8276186: Require getAvailableLocales() methods to include Locale.ROOT
  • df02daa: 8269986: Remove +3 from Symbol::identity_hash()
  • 2374abd: 8276678: Malformed Javadoc inline tags in JDK source in com/sun/beans/decoder/DocumentHandler.java
  • 67c2714: 8276889: Improve compatibility discussion in instanceKlass.cpp
  • a5c160c: 8267108: Alternate Subject.getSubject and doAs APIs that do not depend on Security Manager APIs
  • ... and 7 more: https://git.openjdk.java.net/jdk/compare/0f463a7bf73791eda9404882ff63daf9040399bb...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 11, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Nov 11, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 11, 2021

@shipilev Pushed as commit 91bb0d6.

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

@shipilev shipilev deleted the JDK-8276796-zgc-systemgc branch Nov 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-gc integrated
3 participants