Skip to content

8356807: Change log_info(cds) to MetaspaceShared::report_loading_error() #26253

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

Conversation

calvinccheung
Copy link
Member

@calvinccheung calvinccheung commented Jul 10, 2025

The patch changes some of the aot_log_info(aot)() to MetaspaceShared::report_loading_error() for those referring to an error condition during loading of AOT cache or CDS archive.

Passed tiers 1 - 4 testing.


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-8356807: Change log_info(cds) to MetaspaceShared::report_loading_error() (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26253

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@calvinccheung calvinccheung marked this pull request as ready for review July 10, 2025 21:19
@bridgekeeper
Copy link

bridgekeeper bot commented Jul 10, 2025

👋 Welcome back ccheung! 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 Jul 10, 2025

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

8356807: Change log_info(cds) to `MetaspaceShared::report_loading_error()`

Reviewed-by: matsaave, iklam

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 60 new commits pushed to 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 the rfr Pull request is ready for review label Jul 10, 2025
@openjdk
Copy link

openjdk bot commented Jul 10, 2025

@calvinccheung 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 Jul 10, 2025
@mlbridge
Copy link

mlbridge bot commented Jul 10, 2025

Webrevs

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.
I would suggest running tiers 5 and 6 as well, as some test cases may be sensitive to the messages that are printed in the "error" level by MetaspaceShared::report_loading_error()

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 14, 2025
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jul 15, 2025
@calvinccheung
Copy link
Member Author

I noticed one test failure in tier5. Updated the ArchiveModuleWithCustomImageTest.java test.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 15, 2025
Copy link
Contributor

@matias9927 matias9927 left a comment

Choose a reason for hiding this comment

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

LGTM! Just one nit below

@@ -2018,7 +2018,7 @@ bool FileMapHeader::validate() {
const char* prop = Arguments::get_property("java.system.class.loader");
if (prop != nullptr) {
if (has_aot_linked_classes()) {
aot_log_error(aot)("%s has aot-linked classes. It cannot be used when the "
MetaspaceShared::report_loading_error("%s has aot-linked classes. It cannot be used when the "
Copy link
Contributor

Choose a reason for hiding this comment

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

The alignment was changed here.

Copy link
Member Author

Choose a reason for hiding this comment

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

Line 2022 already ends at column 115. If I indent it more to the right to align with line 2021, the line will end past column 125. I will leave it as is.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed the indent per our offline discussion.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jul 15, 2025
Copy link
Contributor

@matias9927 matias9927 left a comment

Choose a reason for hiding this comment

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

Thanks for the fix, looks good!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 15, 2025
@calvinccheung
Copy link
Member Author

Thanks @iklam @matias9927 for the review.

/integrate

@openjdk
Copy link

openjdk bot commented Jul 15, 2025

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 15, 2025

@calvinccheung Pushed as commit 38af17d.

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

@calvinccheung calvinccheung deleted the 8356807-report_loading_error branch July 15, 2025 20:57
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