Skip to content

8306476: CDS ArchiveHeapTestClass.java test asserts when vm_exit is called on VM thread #13583

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

Closed
wants to merge 1 commit into from

Conversation

matias9927
Copy link
Contributor

@matias9927 matias9927 commented Apr 21, 2023

The change in JDK-8303422 consolidated the different ways to exit the VM during CDS errors, but it included a small mistake. The use of vm_exit() is unsafe in some cases, so the method was updated to use vm_direct_exit() instead. Verified with tier 1-5 tests.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8306476: CDS ArchiveHeapTestClass.java test asserts when vm_exit is called on VM thread

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/13583/head:pull/13583
$ git checkout pull/13583

Update a local copy of the PR:
$ git checkout pull/13583
$ git pull https://git.openjdk.org/jdk.git pull/13583/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13583

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/13583.diff

Webrev

Link to Webrev Comment

@matias9927 matias9927 marked this pull request as ready for review April 21, 2023 16:09
@bridgekeeper
Copy link

bridgekeeper bot commented Apr 21, 2023

👋 Welcome back matsaave! 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 Pull request is ready for review label Apr 21, 2023
@openjdk
Copy link

openjdk bot commented Apr 21, 2023

@matias9927 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 hotspot-runtime-dev@openjdk.org label Apr 21, 2023
@mlbridge
Copy link

mlbridge bot commented Apr 21, 2023

Webrevs

Copy link
Member

@calvinccheung calvinccheung left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk
Copy link

openjdk bot commented Apr 21, 2023

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

8306476: CDS ArchiveHeapTestClass.java test asserts when vm_exit is called on VM thread

Reviewed-by: ccheung

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

  • 723037a: 8298048: Combine CDS archive heap into a single block
  • d518dbf: 8306440: Rename PSS:_num_optional_regions to _max_num_optional_regions
  • 9cd5741: 8306436: Rename PSS*:_n_workers to PSS*:_num_workers
  • 6e77e14: 8306456: Don't leak _worklist's memory in PhaseLive::compute
  • be6031b: 8303703: Add support of execution tests using virtual thread factory jtreg plugin
  • 5a00617: 8306543: GHA: MSVC installation is failing
  • 3da987a: 8306075: Micro-optimize Enum.hashCode
  • fdaabd6: 8306581: JVMCI tests failed when run with -XX:TypeProfileLevel=222 after JDK-8303431
  • 36ec05d: 8306430: Open source some AWT tests related to TextComponent and Toolkit
  • 8346ae2: 8305942: Open source several AWT Focus related tests
  • ... and 19 more: https://git.openjdk.org/jdk/compare/d03128d0e5158ea967e714341c019b9af00ac4a1...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 Pull request is ready to be integrated label Apr 21, 2023
Copy link
Member

@iklam iklam left a comment

Choose a reason for hiding this comment

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

LGTM

@matias9927
Copy link
Contributor Author

Thanks for the reviews @calvinccheung and @iklam!
/integrate

@openjdk
Copy link

openjdk bot commented Apr 24, 2023

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

  • 7400aff: 8305252: make_method_handle_intrinsic may call java code under a lock
  • f239695: 8305056: Avoid unaligned access in emit_intX methods if it's unsupported
  • 136dad7: 8306566: Open source several clipboard AWT tests
  • 30fa50d: 8305062: Refactor CardTable::resize_covered_region
  • 4a9f8ef: 8057586: Explicit GC ignored if GCLocker is active
  • ce493dd: 8306435: Juggle04/TestDescription.java should be a booleanArr test and not a byteArr one
  • f7d45b8: 8306076: Open source AWT misc tests
  • 4900517: 8306636: Disable compiler/c2/Test6905845.java with -XX:TieredStopAtLevel=3
  • 0f51e63: 8305590: Remove nothrow exception specifications from operator new
  • 8d696ae: 8306575: Clean up and open source four Dialog related tests
  • ... and 33 more: https://git.openjdk.org/jdk/compare/d03128d0e5158ea967e714341c019b9af00ac4a1...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 24, 2023
@openjdk openjdk bot closed this Apr 24, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 24, 2023
@openjdk
Copy link

openjdk bot commented Apr 24, 2023

@matias9927 Pushed as commit 62acc88.

💡 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 hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants