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
8304147: JVM crash during shutdown when dumping dynamic archive #13134
Conversation
…, prepare and dump in one. Minor tweak to test.
👋 Welcome back dholmes! A progress list of the required criteria for merging this PR into |
|
@dholmes-ora The following label will be automatically applied to this pull request:
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. |
/issue 8304147 |
@dholmes-ora This issue is referenced in the PR title - it will now be updated. |
@dholmes-ora |
@dholmes-ora |
Webrevs
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for fixing this. I've couple of comments.
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ExitRaceTest.java
Outdated
Show resolved
Hide resolved
Thanks for looking at this @calvinccheung ! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updates look good.
@dholmes-ora 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:
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 62 new commits pushed to the
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consolidating some of the simpler methods is a good idea! LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a very nice simplification of the JVM exit paths. I had a few minor comments.
Thanks for the review @matias9927 ! |
Thanks for the review @coleenp - all comments now addressed. |
/integrate |
Going to push as commit 63ce88b.
Your commit was automatically rebased without conflicts. |
@dholmes-ora Pushed as commit 63ce88b. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
DynamicArchive::prepare_for_dump_at_exit()
could be called concurrently on the two VM exit paths, leading either to assertion failures in debug builds, or a crash in product build when the actual dump occurred. The basic fix was to move theDynamicArchive::prepare_for_dump_at_exit()
functionality intobefore_exit
(java.cpp) where it can only be executed by one thread - thus avoiding the race (Phase 1).Once that is done we can move the actual dump operation to be co-located with the
prepare_for_dump_at_exit()
(Phase 2) and then consolidate that code by refactoring it into a newDynamicArchive::dump_at_exit()
method (Phase 3), and then removing the leftover methods that are no longer needed (Phase 4).Each phase can be seen in distinct commits if you prefer to see the steps involved.
Testing:
Thanks.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/13134/head:pull/13134
$ git checkout pull/13134
Update a local copy of the PR:
$ git checkout pull/13134
$ git pull https://git.openjdk.org/jdk.git pull/13134/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 13134
View PR using the GUI difftool:
$ git pr show -t 13134
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/13134.diff