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

8274838: runtime/cds/appcds/TestSerialGCWithCDS.java fails on Windows #5839

Closed
wants to merge 2 commits into from

Conversation

DamonFool
Copy link
Member

@DamonFool DamonFool commented Oct 6, 2021

Hi all,

runtime/cds/appcds/TestSerialGCWithCDS.java fails on our Windows hosts.

This is because the failure msgs are different with -Xmx2m and -Xmx1m on Windows.

# ./java -Xmx2m -XX:+UseSerialGC -XX:ObjectAlignmentInBytes=64 -version
Error occurred during initialization of VM
GC triggered before VM initialization completed. Try increasing NewSize, current value 640K.

#  ./java -Xmx1m -XX:+UseSerialGC -XX:ObjectAlignmentInBytes=64 -version
Error occurred during initialization of VM
Too small maximum heap

The test only handles the -Xmx1m msg but fails with -Xmx2m.
The fix takes both error msgs into consideration.

Thanks.
Best regards,
Jie


Progress

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

Issue

  • JDK-8274838: runtime/cds/appcds/TestSerialGCWithCDS.java fails on Windows

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5839

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 6, 2021

👋 Welcome back jiefu! 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 Oct 6, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 6, 2021

@DamonFool 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 Oct 6, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 6, 2021

Webrevs

iklam
iklam approved these changes Oct 6, 2021
Copy link
Member

@iklam iklam left a comment

LGTM. Thanks for fixing it.

@openjdk
Copy link

@openjdk openjdk bot commented Oct 6, 2021

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

8274838: runtime/cds/appcds/TestSerialGCWithCDS.java fails on Windows

Reviewed-by: iklam, hseigel

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

  • 340c715: 8273929: Remove GzipRandomAccess in heap dump test
  • 8319836: 8274546: Shenandoah: Remove unused ShenandoahUpdateRootsTask copy
  • d5ccfa2: 8274755: Replace 'while' cycles with iterator with enhanced-for in jdk.jdi
  • 29dcbb7: 8274716: JDWP Spec: the description for the Dispose command confuses suspend with resume.
  • 5762ec2: 8274780: ChannelInputStream.readNBytes(int) incorrectly calls readAllBytes()
  • 4e960fe: 8274497: Unnecessary Vector usage in AquaFileSystemModel
  • c833b4d: 8274329: Fix non-portable HotSpot code in MethodMatcher::parse_method_pattern
  • d57fb6f: 8274456: Remove jtreg tag manual=yesno java/awt/print/PrinterJob/PageDialogTest.java
  • 734d1fb: 8274211: Test man page that options are documented
  • 9561fea: 8273102: Delete deprecated for removal the empty finalize() in java.desktop module
  • ... and 5 more: https://git.openjdk.java.net/jdk/compare/b8af6a9bfb28aaf0fea0cfdaba13236dc8cbaa3a...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 Oct 6, 2021
hseigel
hseigel approved these changes Oct 6, 2021
Copy link
Member

@hseigel hseigel left a comment

Looks good, Just the one comment.
Thanks, Harold

String exp2 = "GC triggered before VM initialization completed";
if (!output.contains(exp1) && !output.contains(exp2)) {
throw new RuntimeException("'" + exp1 + "' or '" + exp2 + "' missing from stdout/stderr \n");
}
Copy link
Member

@hseigel hseigel Oct 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you change the RuntimeException message to something like "Either " + exp1 + " or " + exp2 + "must be in stdout/stderr"

Otherwise, it sounds like both messages are needed.

Copy link
Member Author

@DamonFool DamonFool Oct 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you change the RuntimeException message to something like "Either " + exp1 + " or " + exp2 + "must be in stdout/stderr"

Otherwise, it sounds like both messages are needed.

Updated.
Thanks.

hseigel
hseigel approved these changes Oct 7, 2021
Copy link
Member

@hseigel hseigel left a comment

The new message looks good. Thanks for changing it.
Harold

@DamonFool
Copy link
Member Author

@DamonFool DamonFool commented Oct 7, 2021

Thanks @iklam and @hseigel .
/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Oct 7, 2021

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

  • 340c715: 8273929: Remove GzipRandomAccess in heap dump test
  • 8319836: 8274546: Shenandoah: Remove unused ShenandoahUpdateRootsTask copy
  • d5ccfa2: 8274755: Replace 'while' cycles with iterator with enhanced-for in jdk.jdi
  • 29dcbb7: 8274716: JDWP Spec: the description for the Dispose command confuses suspend with resume.
  • 5762ec2: 8274780: ChannelInputStream.readNBytes(int) incorrectly calls readAllBytes()
  • 4e960fe: 8274497: Unnecessary Vector usage in AquaFileSystemModel
  • c833b4d: 8274329: Fix non-portable HotSpot code in MethodMatcher::parse_method_pattern
  • d57fb6f: 8274456: Remove jtreg tag manual=yesno java/awt/print/PrinterJob/PageDialogTest.java
  • 734d1fb: 8274211: Test man page that options are documented
  • 9561fea: 8273102: Delete deprecated for removal the empty finalize() in java.desktop module
  • ... and 5 more: https://git.openjdk.java.net/jdk/compare/b8af6a9bfb28aaf0fea0cfdaba13236dc8cbaa3a...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 7, 2021
@openjdk openjdk bot added the integrated label Oct 7, 2021
@DamonFool DamonFool deleted the JDK-8274838 branch Oct 7, 2021
@openjdk openjdk bot removed ready rfr labels Oct 7, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 7, 2021

@DamonFool Pushed as commit 722d639.

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