8344821: Test CheckDefaultArchiveFile.java fails if classes_coh.jsa is not present #22374

calvinccheung · 2024-11-25T23:45:55Z

JDK image built by Oracle does not include the CDS archives for compact object headers. This fix throws a SkippedException if UseCompactObjectHeaders is enabled and the default CDS archive for COH is not present.

Update:
Instead of fixing the test, we've decided to just removing it.

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-8344821: Test CheckDefaultArchiveFile.java fails if classes_coh.jsa is not present (Bug - P4)

Reviewers

Ioi Lam (@iklam - Reviewer)
David Holmes (@dholmes-ora - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22374

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

Using diff file

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

Using Webrev

Link to Webrev Comment

…s not present

bridgekeeper · 2024-11-25T23:46:26Z

👋 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 · 2024-11-25T23:47:06Z

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

8344821: Test CheckDefaultArchiveFile.java fails if classes_coh.jsa is not present

Reviewed-by: iklam, dholmes

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

c329f97: 8345015: Remove unused method lookup_time_t_function
86d527f: 8344949: javax.security.auth.Subject.SecureSet.writeObject does not do a security check anymore
f0b72f7: 8342380: Implement JEP 498: Warn upon Use of Memory-Access Methods in sun.misc.Unsafe
fc2da15: 8344419: Use StaticProperty in some JDK classes
3e509c8: 8344773: SM cleanup in ForkJoinPool
6da3ecd: 8344960: RISC-V: fix TestFloatConversionsVectorNaN for COH and AlignVector
9291abc: 8342074: Fix runtime/Thread/TestAlwaysPreTouchStacks.java to be flagless or accept VM flags
0054bbe: 8343756: CAN_SHOW_REGISTERS_ON_ASSERT for Windows
3a625f3: 8344628: Test TestEnableJVMCIProduct.java run with virtual thread intermittent fails
25dd51e: 8344222: Remove calls to SecurityManager and doPrivileged in java.net.HttpURLConnection, java.net.HttpConnectSocketImpl, and javax.net.HttpsURLConnection after JEP 486 integration
... and 165 more: https://git.openjdk.org/jdk/compare/9e92a9e2bab04b79626b88a7dd017dd0def04d7a...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 · 2024-11-25T23:47:52Z

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

mlbridge · 2024-11-25T23:52:34Z

Webrevs

01: Full - Incremental (33a6c455)
00: Full (a100092a)

dholmes-ora · 2024-11-26T00:50:19Z

I think I agree with what @iklam said in JBS - this test seems to have no purpose now. I can't tell what exactly it is trying to check for. Depending on the runtime flags the name of the expected "default archive" is different, but it is not mandatory to have an archive file present - unless it is the plain classes.jsa one ?

And what does Platform.isDefaultCDSArchiveSupported() actually mean now we have the optional COH archive?

calvinccheung · 2024-11-26T04:05:27Z

I think this test was written for JEP341 where it eliminates and extra step of doing -Xshare:dump and enables -Xshare:auto by default. At that time, there was only one CDS archive (classes.jsa). It gets more complicated now with the COH option. I'm fine with removing this test. If the "default" archive is not available for some reasons, other tests such as the dynamic CDS archive tests would fail so we have coverage there.

iklam

LGTM

iklam · 2024-11-26T06:32:41Z

There are also other test cases that call Platform.isDefaultCDSArchiveSupported(). I think these probably need to be cleaned up / removed (in separate RFE?)

./lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java:                "areCustomLoadersSupportedForCDS", "isDefaultCDSArchiveSupported",
./jdk/tools/jlink/plugins/CDSPluginTest.java:        if (!Platform.isDefaultCDSArchiveSupported())
./hotspot/jtreg/runtime/cds/CheckSharingWithDefaultArchive.java:        if (!Platform.isDefaultCDSArchiveSupported()) {
./hotspot/jtreg/runtime/cds/CheckDefaultArchiveFile.java:            if (Platform.isDefaultCDSArchiveSupported()) {
./hotspot/jtreg/runtime/cds/CheckDefaultArchiveFile.java:            if (Platform.isDefaultCDSArchiveSupported()) {
./hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineSharedClass.java:        if (!Platform.isDefaultCDSArchiveSupported()) {
./lib/jdk/test/lib/Platform.java:    public static boolean isDefaultCDSArchiveSupported() {

dholmes-ora

LGTM2

iklam · 2024-11-26T07:19:55Z

The PR summary needs to be updated.

calvinccheung · 2024-11-26T17:16:35Z

There are also other test cases that call Platform.isDefaultCDSArchiveSupported(). I think these probably need to be cleaned up / removed (in separate RFE?)

./lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java:                "areCustomLoadersSupportedForCDS", "isDefaultCDSArchiveSupported",
./jdk/tools/jlink/plugins/CDSPluginTest.java:        if (!Platform.isDefaultCDSArchiveSupported())
./hotspot/jtreg/runtime/cds/CheckSharingWithDefaultArchive.java:        if (!Platform.isDefaultCDSArchiveSupported()) {
./hotspot/jtreg/runtime/cds/CheckDefaultArchiveFile.java:            if (Platform.isDefaultCDSArchiveSupported()) {
./hotspot/jtreg/runtime/cds/CheckDefaultArchiveFile.java:            if (Platform.isDefaultCDSArchiveSupported()) {
./hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineSharedClass.java:        if (!Platform.isDefaultCDSArchiveSupported()) {
./lib/jdk/test/lib/Platform.java:    public static boolean isDefaultCDSArchiveSupported() {

Other than CheckDefaultArchiveFile.java, the other tests seem to be running fine so far. Will file bug if the other tests start failing.

calvinccheung · 2024-11-26T17:17:04Z

Thanks for the reviews.

/integrate

openjdk · 2024-11-26T17:17:49Z

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

d752f19: 8343427: Class file load hook crashes on archived classes from multi-release JARs
f1b5a6e: 8344565: SM cleanup in jdk/internal and java/lang package private classes
d8a2337: 8344895: SM cleanup of module java.xml
c329f97: 8345015: Remove unused method lookup_time_t_function
86d527f: 8344949: javax.security.auth.Subject.SecureSet.writeObject does not do a security check anymore
f0b72f7: 8342380: Implement JEP 498: Warn upon Use of Memory-Access Methods in sun.misc.Unsafe
fc2da15: 8344419: Use StaticProperty in some JDK classes
3e509c8: 8344773: SM cleanup in ForkJoinPool
6da3ecd: 8344960: RISC-V: fix TestFloatConversionsVectorNaN for COH and AlignVector
9291abc: 8342074: Fix runtime/Thread/TestAlwaysPreTouchStacks.java to be flagless or accept VM flags
... and 168 more: https://git.openjdk.org/jdk/compare/9e92a9e2bab04b79626b88a7dd017dd0def04d7a...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-11-26T17:18:08Z

@calvinccheung Pushed as commit 2465526.

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

8344821: Test CheckDefaultArchiveFile.java fails if classes_coh.jsa i…

a100092

…s not present

calvinccheung marked this pull request as ready for review November 25, 2024 23:46

openjdk bot added the rfr Pull request is ready for review label Nov 25, 2024

openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Nov 25, 2024

delete the test

33a6c45

iklam approved these changes Nov 26, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 26, 2024

dholmes-ora approved these changes Nov 26, 2024

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Nov 26, 2024

openjdk bot closed this Nov 26, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 26, 2024

calvinccheung deleted the 8344821-CheckDefaultArchiveFile branch November 26, 2024 17:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8344821: Test CheckDefaultArchiveFile.java fails if classes_coh.jsa is not present #22374

8344821: Test CheckDefaultArchiveFile.java fails if classes_coh.jsa is not present #22374

calvinccheung commented Nov 25, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Nov 25, 2024

openjdk bot commented Nov 25, 2024 •

edited

Loading

openjdk bot commented Nov 25, 2024

mlbridge bot commented Nov 25, 2024 •

edited

Loading

dholmes-ora commented Nov 26, 2024

calvinccheung commented Nov 26, 2024

iklam left a comment

iklam commented Nov 26, 2024

dholmes-ora left a comment

iklam commented Nov 26, 2024

calvinccheung commented Nov 26, 2024

calvinccheung commented Nov 26, 2024

openjdk bot commented Nov 26, 2024

openjdk bot commented Nov 26, 2024

8344821: Test CheckDefaultArchiveFile.java fails if classes_coh.jsa is not present #22374

8344821: Test CheckDefaultArchiveFile.java fails if classes_coh.jsa is not present #22374

Conversation

calvinccheung commented Nov 25, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Nov 25, 2024

openjdk bot commented Nov 25, 2024 • edited Loading

openjdk bot commented Nov 25, 2024

mlbridge bot commented Nov 25, 2024 • edited Loading

Webrevs

dholmes-ora commented Nov 26, 2024

calvinccheung commented Nov 26, 2024

iklam left a comment

Choose a reason for hiding this comment

iklam commented Nov 26, 2024

dholmes-ora left a comment

Choose a reason for hiding this comment

iklam commented Nov 26, 2024

calvinccheung commented Nov 26, 2024

calvinccheung commented Nov 26, 2024

openjdk bot commented Nov 26, 2024

openjdk bot commented Nov 26, 2024

calvinccheung commented Nov 25, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Nov 25, 2024 •

edited

Loading

mlbridge bot commented Nov 25, 2024 •

edited

Loading