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

8236042: [TESTBUG] serviceability/sa/ClhsdbCDSCore.java fails with -Xcomp -XX:TieredStopAtLevel=1 #642

Closed

Conversation

zhengyu123
Copy link
Contributor

@zhengyu123 zhengyu123 commented Nov 19, 2021

Backport for parity with Oracle 11.0.15.

The original patch does not apply cleanly due to context difference. However, that patch is small, can be applied manually.

Test:

  • Without patch, serviceability/sa/ClhsdbCDSCore.java test failed with -Xcomp -XX:TieredStopAtLevel=1, passed with patch.

Progress

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

Issue

  • JDK-8236042: [TESTBUG] serviceability/sa/ClhsdbCDSCore.java fails with -Xcomp -XX:TieredStopAtLevel=1

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/642/head:pull/642
$ git checkout pull/642

Update a local copy of the PR:
$ git checkout pull/642
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/642/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 642

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/642.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 19, 2021

👋 Welcome back zgu! 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 9376dd810ce129c1786cce6ab7691f7154902452 8236042: [TESTBUG] serviceability/sa/ClhsdbCDSCore.java fails with -Xcomp -XX:TieredStopAtLevel=1 Nov 19, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 19, 2021

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

@openjdk
Copy link

@openjdk openjdk bot commented Nov 19, 2021

@zhengyu123 This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8236042: [TESTBUG] serviceability/sa/ClhsdbCDSCore.java fails with -Xcomp -XX:TieredStopAtLevel=1

Modify the test case to handle the scenario's of no printmdo's.

Reviewed-by: phh

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

  • 06e9f96: 8210242: [TESTBUG] vmTestbase/nsk/stress/jni/jnistress001.java crashes with EXCEPTION_ACCESS_VIOLATION on windows-x86
  • dcc010d: 8273235: tools/launcher/HelpFlagsTest.java Fails on Windows 32bit
  • 2fb8ca2: 8273026: Slow LoginContext.login() on multi threading application
  • e2b7f1e: 8210198: Clean up JNI_ENV_ARG for vmTestbase/jvmti/Get[A-F] tests
  • 770a78a: 8210182: Remove macros for C compilation from vmTestBase but non jvmti
  • 63277a4: 8226943: compile error in libfollowref003.cpp with XCode 10.2 on macosx
  • 4b591db: 8209611: use C++ compiler for hotspot tests

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 ready rfr labels Nov 19, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 19, 2021

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Lgtm if review is needed.

@zhengyu123
Copy link
Contributor Author

@zhengyu123 zhengyu123 commented Nov 24, 2021

Thanks for the review, @phohensee

@zhengyu123
Copy link
Contributor Author

@zhengyu123 zhengyu123 commented Nov 29, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 29, 2021

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

  • 7f963ca: 8223400: Replace some enums with static const members in hotspot/runtime
  • 1aecb28: 8211899: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/scenarios/[E-M]
  • ccb0ed3: 8212083: Handle remaining gc/lock native code and fix two strings
  • 9e695bb: 8212082: Remove the NSK_CPP_STUB macros for remaining vmTestbase/jvmti/[sS]*
  • 1e0bb2d: 8211432: [REDO] Handle JNIGlobalRefLocker.cpp
  • 48dbaf1: 8261661: gc/stress/TestReclaimStringsLeaksMemory.java fails because Reserved memory size is too big
  • 242bbef: 8270290: NTLM authentication fails if HEAD request is used
  • c395d4b: 8211782: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/[I-S]*
  • 384750d: 8211036: Remove the NSK_STUB macros from vmTestbase for non jvmti
  • b6a9e7e: 8250521: Configure initial RTO to use minimal retry for loopback connections on Windows
  • ... and 26 more: https://git.openjdk.java.net/jdk11u-dev/compare/5e085484dfe5cff46e921c887266661ac97041a5...master

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Nov 29, 2021

@zhengyu123 Pushed as commit 2ea3786.

💡 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
2 participants