Skip to content

8301715: CDS should be disabled in exploded JDK #12705

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 4 commits into from

Conversation

matias9927
Copy link
Contributor

@matias9927 matias9927 commented Feb 22, 2023

CDS is not supported by the exploded JDK yet it is enabled anyway, leading to guaranteed failure. Now there will be no attempt to map the CDS archive on an exploded build. Verified with tier 1 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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12705

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 22, 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
Copy link

openjdk bot commented Feb 22, 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 Feb 22, 2023
@matias9927 matias9927 marked this pull request as ready for review February 22, 2023 22:18
@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 22, 2023
@mlbridge
Copy link

mlbridge bot commented Feb 22, 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.

Fix looks good with one nit.
I'm wondering if the following check can be removed or converted to an assert in FileMapInfo::Initialize():

  if (!Arguments::has_jimage()) {
    FileMapInfo::fail_continue("The shared archive file cannot be used with an exploded module build.");
    return false;
  }

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.

Updates look good.

@openjdk
Copy link

openjdk bot commented Feb 27, 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:

8301715: CDS should be disabled in exploded JDK

Reviewed-by: ccheung, coleenp

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

  • c396f1e: 8304443: bootcycle builds fail after JDK-8015831
  • ded6a81: 8303742: CompletableFuture.orTimeout leaks if the future completes exceptionally
  • 652bda0: 8304411: Remove unused CardTable::clear
  • 4505670: 8304174: Remove delays from httpserver tests
  • c09f83e: 8304293: RISC-V: JDK-8276799 missed atomic intrinsic support for C1
  • e339e18: 7016187: javac -h could generate conflict .h for inner class and class name with '_'
  • 033c0b1: 8304437: ProblemList com/sun/jdi/ThreadMemoryLeadTest.java with ZGC
  • 7503ecc: 8304138: [JVMCI] Test FailedSpeculation existence before appending.
  • f8482c2: 8297638: Memory leak in case of many started-dead threads
  • c56f011: 8298995: tools/jpackage/share/AddLauncherTest.java#id1 failed "AddLauncherTest.test; checks=53"

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@calvinccheung, @iklam, @coleenp) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Feb 27, 2023
@matias9927
Copy link
Contributor Author

Thank you for the review @calvinccheung
/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 27, 2023
@openjdk
Copy link

openjdk bot commented Feb 27, 2023

@matias9927
Your change (at version 34d34d9) is now ready to be sponsored by a Committer.

@openjdk openjdk bot removed the sponsor Pull request is ready to be sponsored label Mar 1, 2023
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.

Updates look good. Thanks.

Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

This seems fine. It appears that Ioi's comments were also addressed.

@openjdk
Copy link

openjdk bot commented Mar 17, 2023

@matias9927 this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout explodedjdk
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 17, 2023
@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review and removed merge-conflict Pull request has merge conflict with target branch labels Mar 17, 2023
Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

Still looks good.

@matias9927
Copy link
Contributor Author

Thank you for the reviews @calvinccheung, @iklam , and @coleenp!
/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 20, 2023
@openjdk
Copy link

openjdk bot commented Mar 20, 2023

@matias9927
Your change (at version 5b65b4f) is now ready to be sponsored by a Committer.

@coleenp
Copy link
Contributor

coleenp commented Mar 20, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 20, 2023

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

  • 80e9797: 8304433: cleanup sentence breaker code in DocTreeMaker
  • c396f1e: 8304443: bootcycle builds fail after JDK-8015831
  • ded6a81: 8303742: CompletableFuture.orTimeout leaks if the future completes exceptionally
  • 652bda0: 8304411: Remove unused CardTable::clear
  • 4505670: 8304174: Remove delays from httpserver tests
  • c09f83e: 8304293: RISC-V: JDK-8276799 missed atomic intrinsic support for C1
  • e339e18: 7016187: javac -h could generate conflict .h for inner class and class name with '_'
  • 033c0b1: 8304437: ProblemList com/sun/jdi/ThreadMemoryLeadTest.java with ZGC
  • 7503ecc: 8304138: [JVMCI] Test FailedSpeculation existence before appending.
  • f8482c2: 8297638: Memory leak in case of many started-dead threads
  • ... and 1 more: https://git.openjdk.org/jdk/compare/254288a518ee1d6d486a96c1883e569fa7e95a68...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 20, 2023

@coleenp @matias9927 Pushed as commit eb73fa8.

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

@offamitkumar
Copy link
Member

Hi,

Are CDS test supposed to run by default in exploded-jdk. Just want to know are these false failures and supposed to be skipped OR we need to do some debugging.

Initially I noticed these failures on headstream with make exploded-test TEST="tier1".

make exploded-test TEST=jtreg:runtime/cds

==============================
Test summary
==============================
   TEST                                              TOTAL  PASS  FAIL ERROR   
>> jtreg:test/hotspot/jtreg/runtime/cds                292    11   281     0 <<
==============================
TEST FAILURE
make test TEST=jtreg:runtime/cds

==============================
Test summary
==============================
   TEST                                              TOTAL  PASS  FAIL ERROR   
   jtreg:test/hotspot/jtreg/runtime/cds                292   292     0     0   
==============================
TEST SUCCESS

@theRealAph
Copy link
Contributor

Yes, that's right. tier1 needs the full images.

@offamitkumar
Copy link
Member

Thanks;

BTW can't we disable these tests for exploded builds ?

@tstuefe
Copy link
Member

tstuefe commented Jun 17, 2024

#19188 fixes up the vm.cds property to be off in exploded builds. Has been for RFR since a while, just needs another review.

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.

7 participants