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

8267845: Add @requires to avoid running G1 large pages test with wrong page size #4226

Closed
wants to merge 1 commit into from

Conversation

kstefanj
Copy link
Contributor

@kstefanj kstefanj commented May 27, 2021

Please review this small test-fix.

Summary
These two tests try to verify that large pages are used correctly for the heap and the G1 internal data structures. The tests start separate processes that are run with specific arguments to know the expected outcome. The sub-processes don't inherit any parameters passed to the test. This is good, but if the parameter LargePageSizeInBytes is passed to the test, the driver process will run with this flag and pick up a different large page size than test-processes. This won't work since the driver will use its found large page size to verify the output from the test.

The simple fix is to simply not run this test if this flag is specified. For the test to work with this flag, more work has to be done to analyze how different page sizes will affect the test and for now I think this is the best approach.

Testing
Manual verification the the tests won't run if LargePageSizeInBytes is set.


Progress

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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4226

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 27, 2021

👋 Welcome back sjohanss! 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 May 27, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 27, 2021

@kstefanj 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 May 27, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 27, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented May 27, 2021

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

8267845: Add @requires to avoid running G1 large pages test with wrong page size

Reviewed-by: tschatzl, kbarrett

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

  • 0c9daa7: 8265029: Preserve SIZED characteristics on slice operations (skip, limit)
  • 95b1fa7: 8267529: StringJoiner can create a String that breaks String::equals
  • 7f52c50: 8182043: Access to Windows Large Icons
  • 8a31c07: 8267886: ProblemList javax/management/remote/mandatory/connection/RMIConnector_NPETest.java
  • ae258f1: 8265418: Clean-up redundant null-checks of Class.getPackageName()
  • 41185d3: 8229517: Support for optional asynchronous/buffered logging
  • 7c85f35: 8267123: Remove RMI Activation
  • 0754266: 8267709: Investigate differences between HtmlStyle and stylesheet.css
  • 23189a1: 8191786: Thread-SMR hash table size should be dynamic
  • ef368b3: 8265836: OperatingSystemImpl.getCpuLoad() returns incorrect CPU load inside a container
  • ... and 7 more: https://git.openjdk.java.net/jdk/compare/37bc4e2e3c2968d7419dae4f421755b6f7d06090...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 the ready label May 27, 2021
Copy link

@kimbarrett kimbarrett left a comment

Looks good.

@kstefanj
Copy link
Contributor Author

@kstefanj kstefanj commented May 31, 2021

/integrate

@kstefanj
Copy link
Contributor Author

@kstefanj kstefanj commented May 31, 2021

Thanks for the reviews @tschatzl and @kimbarrett

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

@openjdk openjdk bot commented May 31, 2021

@kstefanj Since your change was applied there have been 37 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

Pushed as commit ce44cd6.

💡 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
hotspot-gc integrated
3 participants