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

8276769: -Xshare:auto should tolerate problems in the CDS archive #6731

Closed
wants to merge 3 commits into from

Conversation

yminqi
Copy link
Contributor

@yminqi yminqi commented Dec 7, 2021

Hi, Please review

-Xshare:auto, which is the default, is supposed to use the specified archive if possible, but otherwise the VM should continue normal execution and ignore the specified archive(s). But current code in some case will fail and exit. Fixed to allow vm continue without abnormal exit, fixed related tests and added new tests to check various scenarios.

Tests: tier1-4

Thanks
Yumin


Progress

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

Issue

  • JDK-8276769: -Xshare:auto should tolerate problems in the CDS archive

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6731

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 7, 2021

👋 Welcome back minqi! 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
Copy link

@openjdk openjdk bot commented Dec 7, 2021

@yminqi 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 7, 2021
@yminqi yminqi marked this pull request as ready for review Dec 7, 2021
@openjdk openjdk bot added the rfr label Dec 7, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 7, 2021

Webrevs

iklam
iklam approved these changes Dec 7, 2021
Copy link
Member

@iklam iklam left a comment

Hi Yumin, the VM and test changes look good to me. Thanks.

@openjdk
Copy link

@openjdk openjdk bot commented Dec 7, 2021

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

8276769: -Xshare:auto should tolerate problems in the CDS archive

Reviewed-by: iklam, 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 28 new commits pushed to the master branch:

  • fb6d611: 8278276: G1: Refine naming of G1GCParPhaseTimesTracker::_must_record
  • d7ad546: 8276422: Add command-line option to disable finalization
  • ec7cb6d: 8276447: Deprecate finalization-related methods for removal
  • 3c2951f: 8275771: JDK source code contains redundant boolean operations in jdk.compiler and langtools
  • 3d61372: 8278363: Create extented container test groups
  • 716c2e1: 8278368: ProblemList tools/jpackage/share/MultiNameTwoPhaseTest.java on macosx-x64
  • a8a1fbc: 8278068: Fix next-line modifier (snippet markup)
  • 061017a: 8273175: Add @SInCE tags to the DocTree.Kind enum constants
  • d7c283a: 8275233: Incorrect line number reported in exception stack trace thrown from a lambda expression
  • 3955b03: 8277328: jdk/jshell/CommandCompletionTest.java failures on Windows
  • ... and 18 more: https://git.openjdk.java.net/jdk/compare/f148e3e4623c6d0270a10ba73140e0c37ca5398a...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 7, 2021
Copy link
Member

@calvinccheung calvinccheung left a comment

Looks good. Some minor comments.

Copy link
Member

@calvinccheung calvinccheung left a comment

Thanks for the update.

@yminqi
Copy link
Contributor Author

@yminqi yminqi commented Dec 8, 2021

@iklam @calvinccheung
Thanks for review!

@yminqi
Copy link
Contributor Author

@yminqi yminqi commented Dec 8, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Dec 8, 2021

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

  • 79165b7: 8278324: Update the --generate-cds-archive jlink plugin usage message
  • 40d726b: 8278310: Improve logging in CDS DynamicLoaderConstraintsTest.java
  • e4852c6: 8277998: runtime/cds/appcds/loaderConstraints/DynamicLoaderConstraintsTest.java#custom-cl-zgc failed "assert(ZAddress::is_marked(addr)) failed: Should be marked"
  • 37921e3: 8269258: java/net/httpclient/ManyRequestsLegacy.java failed with connection timeout
  • fd8cb2d: 8278346: java/nio/file/Files/probeContentType/Basic.java fails on Linux SLES15 machine
  • e5cb84e: 8278336: Use int64_t to represent byte quantities consistently in JfrObjectAllocationSample
  • 54993b1: 8278309: [windows] use of uninitialized OSThread::_state
  • 10e0318: 8278158: jwebserver should set request timeout
  • 5dcdee4: 8262341: Refine identical code in AddI/LNode.
  • b334d96: 8276964: Better indicate a snippet that could not be processed
  • ... and 31 more: https://git.openjdk.java.net/jdk/compare/f148e3e4623c6d0270a10ba73140e0c37ca5398a...master

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Dec 8, 2021

@yminqi Pushed as commit 3e93e0b.

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

@yminqi yminqi deleted the jdk-8276769 branch Dec 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime integrated
3 participants