-
Notifications
You must be signed in to change notification settings - Fork 6.1k
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
8356807: Change log_info(cds) to MetaspaceShared::report_loading_error()
#26253
Conversation
👋 Welcome back ccheung! A progress list of the required criteria for merging this PR into |
@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:
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
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 |
@calvinccheung 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. |
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.
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()
I noticed one test failure in tier5. Updated 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.
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 " |
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.
The alignment was changed here.
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.
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.
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.
Fixed the indent per our offline discussion.
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 the fix, looks good!
Thanks @iklam @matias9927 for the review. /integrate |
Going to push as commit 38af17d.
Your commit was automatically rebased without conflicts. |
@calvinccheung Pushed as commit 38af17d. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
The patch changes some of the
aot_log_info(aot)()
toMetaspaceShared::report_loading_error()
for those referring to an error condition during loading of AOT cache or CDS archive.Passed tiers 1 - 4 testing.
Progress
Issue
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