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

8278116: runtime/modules/LoadUnloadModuleStress.java has duplicate -Xmx #6660

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Contributor

@shipilev shipilev commented Dec 2, 2021

Spotted by Andrey here: #6574 (comment)

Seems to be that way since initial integration in JDK-8142968.

Additional testing:

  • Affected test still passes on Linux x86_64 fastdebug

Progress

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

Issue

  • JDK-8278116: runtime/modules/LoadUnloadModuleStress.java has duplicate -Xmx

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6660

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 2, 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 Dec 2, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 2, 2021

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

  • hotspot-runtime

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-runtime label Dec 2, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 2, 2021

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Seems fine and trivial.

Thanks,
David

@openjdk
Copy link

@openjdk openjdk bot commented Dec 2, 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:

8278116: runtime/modules/LoadUnloadModuleStress.java has duplicate -Xmx

Reviewed-by: dholmes

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

  • a093cdd: 8276657: XSLT compiler tries to define a class with empty name
  • 8198807: 8266435: WBMPImageReader.read() should not truncate the input stream
  • b226ab9: 8276141: XPathFactory set/getProperty method
  • 09522db: 8277647: [REDO] JDK-8277507 Add jlink.debug system property while launching jpackage tests to help diagonize recent intermittent failures
  • 67745fa: 8276299: G1: Unify the wording buffer/node/element in G1SegmentedArrayXxx, G1CardSetXxx and related classes
  • 51d6d7a: 8266839: Enable pandoc on macosx-aarch64 at Oracle
  • 0dfb3a7: 8268582: javadoc throws NPE with --ignore-source-errors option
  • f41e768: 8277762: Allow configuration of HOTSPOT_BUILD_USER
  • a363b7b: 8177819: DateTimeFormatterBuilder zone parsing should recognise DST
  • 9b3e672: 8278014: [vectorapi] Remove test run script
  • ... and 8 more: https://git.openjdk.java.net/jdk/compare/fde0b95ede68c188479852c46df7e28dc4b79594...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 Dec 2, 2021
@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Dec 3, 2021

Thanks!

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Dec 3, 2021

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

  • 473ecec: 8278174: runtime/cds/appcds/LambdaWithJavaAgent.java fails with release VMs
  • 19ce33d: 8258512: serviceability/sa/TestJmapCore.java timed out on macOS 10.13.6
  • c93552c: 8277069: [REDO] JDK-8276743 Make openjdk build Zip Archive generation "reproducible"
  • b8ac0d2: 8276681: Additional malformed Javadoc inline tags in JDK source
  • b310f30: 8277396: [TESTBUG] In DefaultButtonModelCrashTest.java, frame is accessed from main thread
  • 15345e3: 8276661: (fs) UserDefinedFileAttributeView no longer works with long path (win)
  • 652b5f8: 8276674: Malformed Javadoc inline tags in JDK source
  • e0f1fc7: 8277358: Accelerate CRC32-C
  • 73a9654: 8276806: Use Objects.checkFromIndexSize where possible in java.base
  • 30087cc: 8275342: Change nested classes in java.prefs to static nested classes
  • ... and 38 more: https://git.openjdk.java.net/jdk/compare/fde0b95ede68c188479852c46df7e28dc4b79594...master

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Dec 3, 2021

@shipilev Pushed as commit bef5c7a.

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

@shipilev shipilev deleted the JDK-8278116-duplicate-xmx branch Dec 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime integrated
2 participants