8267954: Shared classes that failed to load should not be loaded again #4434

yminqi · 2021-06-09T16:24:42Z

Hi, Please review
Shared classes should not be loaded again at failed loading from CDS. In the failed case, restore_unshareable_info failed due to some reason (OOM), but the class already polluted and failed to be loaded again.
Using the unused bit in _misc_flags indicates shared loading status to prevent it from being loaded again.

Tests: tier1,tier2,tier3,tier4,tier7
Local tests: jtreg/hotspot/runtime/cds
TestDynamicDumpAtOom.java (which failed in tier7) with variant allocation sizes (used to reproduce the failure) passed.

Thanks
Yumin

Progress

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

Issue

JDK-8267954: Shared classes that failed to load should not be loaded again

Reviewers

Ioi Lam (@iklam - Reviewer)
Calvin Cheung (@calvinccheung - Reviewer) ⚠️ Review applies to 4cb6d35

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4434

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

Using diff file

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

bridgekeeper · 2021-06-09T16:25:22Z

👋 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 · 2021-06-09T16:26:55Z

@yminqi The following label will be automatically applied to this pull request:

hotspot

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.

mlbridge · 2021-06-09T16:31:23Z

Webrevs

yminqi · 2021-06-09T16:34:11Z

/label add hotspot-runtime

openjdk · 2021-06-09T16:35:17Z

@yminqi
The hotspot-runtime label was successfully added.

iklam

LGTM. Some small nits.

src/hotspot/share/classfile/systemDictionary.hpp

src/hotspot/share/classfile/systemDictionaryShared.cpp

openjdk · 2021-06-09T17:15:18Z

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

8267954: Shared classes that failed to load should not be loaded again

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

991ca14: 8267430: GraphicsDevice.setDisplayMode(REFRESH_RATE_UNKNOWN) throws IAE: Unable to set display mode!
bf29a01: 8228343: JCMD and attach fail to work across Linux Container boundary
408e0a9: 8255148: Confusing log output: SSLSocket duplex close failed
bbd0313: 8263203: jconsole Online User Guide has wrong URL
33d34c6: 8263323: Debug Agent help output includes invalid URL
79010f2: 8266835: Add a --validate option to the jar tool
db45ff0: 8268052: [JVMCI] non-default installed code must be marked as in_use
bb3d226: 8238213: Method resolution should stop on static error
81fdeb5: 8268417: Add test from JDK-8268360
caf7f49: 8268122: Add specific gc cause for G1 full collections
... and 41 more: https://git.openjdk.java.net/jdk/compare/fc08af58cb0571ed375a7937aac7a951ba224644...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.

iklam · 2021-06-09T19:15:00Z

src/hotspot/share/classfile/systemDictionary.cpp

      SharedClassLoadingMark slm(THREAD, k);
+#endif


I think it's cleaner to use the CDS_ONLY macro. This macro is already used elsewhere in this file.

CDS_ONLY(SharedClassLoadingMark slm(THREAD, k));

calvinccheung

Looks good.

iklam

Latest version LGTM

yminqi · 2021-06-09T21:32:05Z

@iklam @calvinccheung
Thanks for review!

yminqi · 2021-06-09T21:32:20Z

/integrate

openjdk · 2021-06-09T21:33:55Z

@yminqi Since your change was applied there have been 51 commits pushed to the master branch:

991ca14: 8267430: GraphicsDevice.setDisplayMode(REFRESH_RATE_UNKNOWN) throws IAE: Unable to set display mode!
bf29a01: 8228343: JCMD and attach fail to work across Linux Container boundary
408e0a9: 8255148: Confusing log output: SSLSocket duplex close failed
bbd0313: 8263203: jconsole Online User Guide has wrong URL
33d34c6: 8263323: Debug Agent help output includes invalid URL
79010f2: 8266835: Add a --validate option to the jar tool
db45ff0: 8268052: [JVMCI] non-default installed code must be marked as in_use
bb3d226: 8238213: Method resolution should stop on static error
81fdeb5: 8268417: Add test from JDK-8268360
caf7f49: 8268122: Add specific gc cause for G1 full collections
... and 41 more: https://git.openjdk.java.net/jdk/compare/fc08af58cb0571ed375a7937aac7a951ba224644...master

Your commit was automatically rebased without conflicts.

Pushed as commit 7ff6e7b.

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

dholmes-ora · 2021-06-10T04:14:09Z

src/hotspot/share/oops/instanceKlass.hpp

+    _misc_flags |= _misc_shared_loading_failed;
+  }
+
+  void clear_shared_loading_failed() {


This seems unused. And I would not expect loading to "unfail" so can't see why this bit once set would ever be cleared.

8265954: Shared classes that failed to load should not be loaded again

3ca038e

openjdk bot added the rfr Pull request is ready for review label Jun 9, 2021

openjdk bot added the hotspot hotspot-dev@openjdk.org label Jun 9, 2021

yminqi changed the title ~~8265954: Shared classes that failed to load should not be loaded again~~ 8267954: Shared classes that failed to load should not be loaded again Jun 9, 2021

openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Jun 9, 2021

iklam approved these changes Jun 9, 2021

View reviewed changes

src/hotspot/share/classfile/systemDictionary.hpp Outdated Show resolved Hide resolved

src/hotspot/share/classfile/systemDictionaryShared.cpp Show resolved Hide resolved

openjdk bot added the ready Pull request is ready to be integrated label Jun 9, 2021

Move SharedClassLoadingMark to systemDictionaryShared.hpp

4cb6d35

iklam reviewed Jun 9, 2021

View reviewed changes

calvinccheung approved these changes Jun 9, 2021

View reviewed changes

Use CDS_ONLY for one line to replace INCLUDE_CDS

951c0fa

iklam approved these changes Jun 9, 2021

View reviewed changes

openjdk bot closed this Jun 9, 2021

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 9, 2021

yminqi deleted the jdk-8267954 branch June 9, 2021 21:39

dholmes-ora reviewed Jun 10, 2021

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8267954: Shared classes that failed to load should not be loaded again #4434

8267954: Shared classes that failed to load should not be loaded again #4434

Uh oh!

yminqi commented Jun 9, 2021 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented Jun 9, 2021

Uh oh!

openjdk bot commented Jun 9, 2021

Uh oh!

mlbridge bot commented Jun 9, 2021 •

edited

Loading

Uh oh!

yminqi commented Jun 9, 2021

Uh oh!

openjdk bot commented Jun 9, 2021

Uh oh!

iklam left a comment

Uh oh!

Uh oh!

Uh oh!

openjdk bot commented Jun 9, 2021 •

edited

Loading

Uh oh!

iklam Jun 9, 2021

Uh oh!

calvinccheung left a comment

Uh oh!

iklam left a comment

Uh oh!

yminqi commented Jun 9, 2021

Uh oh!

yminqi commented Jun 9, 2021

Uh oh!

openjdk bot commented Jun 9, 2021

Uh oh!

dholmes-ora Jun 10, 2021 •

edited

Loading

Uh oh!

Uh oh!

8267954: Shared classes that failed to load should not be loaded again #4434

8267954: Shared classes that failed to load should not be loaded again #4434

Uh oh!

Conversation

yminqi commented Jun 9, 2021 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Jun 9, 2021

Uh oh!

openjdk bot commented Jun 9, 2021

Uh oh!

mlbridge bot commented Jun 9, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

yminqi commented Jun 9, 2021

Uh oh!

openjdk bot commented Jun 9, 2021

Uh oh!

iklam left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

openjdk bot commented Jun 9, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

iklam Jun 9, 2021

Choose a reason for hiding this comment

Uh oh!

calvinccheung left a comment

Choose a reason for hiding this comment

Uh oh!

iklam left a comment

Choose a reason for hiding this comment

Uh oh!

yminqi commented Jun 9, 2021

Uh oh!

yminqi commented Jun 9, 2021

Uh oh!

openjdk bot commented Jun 9, 2021

Uh oh!

dholmes-ora Jun 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

yminqi commented Jun 9, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Jun 9, 2021 •

edited

Loading

openjdk bot commented Jun 9, 2021 •

edited

Loading

dholmes-ora Jun 10, 2021 •

edited

Loading