8273774: CDSPluginTest should only expect classes_nocoops.jsa exists on supported 64-bit platforms #5519

1996scarlet · 2021-09-15T06:28:25Z

The test assumes that it always runs on 64-bit platform and classes_nocoops.jsa is always created.
It's a test bug. The test should only expect classes_nocoops.jsa exists if it's running on a supported 64-bit platform.
However, for unknown target platform, it's unknown if it's 64-bit or not.

This patch fix the test to check if classes_nocoops.jsa exists only on one of the JDK supported platforms (x64 or aarch64) via the sun.arch.data.model system property.

Please review this change. Thanks!

Progress

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

Issue

JDK-8273774: CDSPluginTest should only expect classes_nocoops.jsa exists on supported 64-bit platforms

Reviewers

Calvin Cheung (@calvinccheung - Reviewer)
Mandy Chung (@mlchung - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5519

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

Using diff file

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

bridgekeeper · 2021-09-15T06:28:55Z

Hi @1996scarlet, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user 1996scarlet" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

1996scarlet · 2021-09-15T06:30:27Z

/covered
Loongson

bridgekeeper · 2021-09-15T06:31:58Z

Thank you! Please allow for a few business days to verify that your employer has signed the OCA. Also, please note that pull requests that are pending an OCA check will not usually be evaluated, so your patience is appreciated!

openjdk · 2021-09-15T06:32:46Z

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

core-libs

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-09-15T14:46:11Z

Webrevs

mlchung · 2021-09-15T16:54:58Z

The test assumes that it always runs on 64-bit platform and classes_nocoops.jsa is always created. It's a test bug. The test should only expect classes_nocoops.jsa exists if it's running on a supported 64-bit platform.

Platform::is64Bit can do better for runtime platform (i.e. Platform::runtime) that can determine if it's 64-bit from the sun.arch.data.model system property. However, for unknown target platform, it's unknown if it's 64-bit or not. So I think fixing the test to check if classes_nocoops.jsa exists only on one of the JDK supported platforms (x64 or aarch64) is a better way to resolve your issue.

mlchung · 2021-09-16T17:21:31Z

Thanks for making the change, Remilia. @calvinccheung is the author of CDSPlugin and this test, who should review this fix.

My suggestion checking on x64 or aarch64 works for the issue you run into but it would fail again when running on a JDK where CDSPlugin does not support for example lib/classlist is not present.

Having a second thought, it would be a better fix for CDSPluginTest to simply skip running if default CDS archive is not supported. There is a method jdk.test.lib.Platform::isDefaultCDSArchiveSupported to test if CDS default archive is supported but it returns false for aarch64. The fix can be like this:

    public static void main(String[] args) throws Throwable {
           // run this test only on the supported platforms
           // explicit test if it's aarch64 platform until Platform::isDefaultCDSArchiveSupported is fixed
           if (!Platform.isDefaultCDSArchiveSupported() && !Platform.isAArch64())) return;
           :
    }

isDefaultCDSArchiveSupported needs to be fixed to include aarch64 but it should be fixed as a separate issue.

calvinccheung · 2021-09-16T17:48:35Z

The fix in the test case seems fine to me.
We'll file a follow-up bug to fix the jdk.test.lib.Platform::isDefaultCDSArchiveSupported method and may re-fix the test case then.

openjdk · 2021-09-16T17:50:23Z

⚠️ @1996scarlet the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout JDK-8273774
$ git commit -c user.name='Preferred Full Name' --allow-empty -m 'Update full name'
$ git push

openjdk · 2021-09-16T17:50:27Z

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

8273774: CDSPluginTest should only expect classes_nocoops.jsa exists on supported 64-bit platforms

Reviewed-by: ccheung, mchung

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

17f7a45: 8273913: Problem list some headful client jtreg tests that fail on macOS 12
27d747a: 8273877: os::unsetenv unused
35f6f1d: 8273808: Cleanup AddFontsToX11FontPath
1890d85: 8273872: ZGC: Explicitly use 2M large pages
54b4567: 8273880: Zero: Print warnings when unsupported intrinsics are enabled
e07ab82: 8273408: java.lang.AssertionError: typeSig ERROR on generated class property of record
8c022e2: 8270434: JDI+UT: Unexpected event in JDI tests
b982904: 8271073: Improve testing with VM option VerifyArchivedFields
bc48a0a: 8273902: Memory leak in OopStorage due to bug in OopHandle::release()
9c5441c: 8271569: Clean up the use of CDS constants and field offsets
... and 14 more: https://git.openjdk.java.net/jdk/compare/74ffe12267cb3ae63072a06f50083fd0352d8049...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.

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, @mlchung) 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).

mlchung · 2021-09-16T17:53:25Z

The fix in the test case seems fine to me.

This test may fail in other cases. We should prepare for those cases in this fix:

if (!Platform.isDefaultCDSArchiveSupported() && !Platform.isAArch64()))
    throw new SkippedException("not a supported platform");

Calvin suggests to throw SkippedException in an offline chat.

calvinccheung · 2021-09-16T18:21:12Z

The fix in the test case seems fine to me.

This test may fail in other cases. We should prepare for those cases in this fix:
if (!Platform.isDefaultCDSArchiveSupported() && !Platform.isAArch64()))
    throw new SkippedException("not a supported platform");

I just noticed there was a bug fix JDK-8269840 (Update Platform.isDefaultCDSArchiveSupported() to return true for aarch64 platforms). So the second condition in the above is not necessary.

Calvin suggests to throw SkippedException in an offline chat.

1996scarlet · 2021-09-17T01:49:38Z

Please reexamine the change.
Thanks all!

mlchung · 2021-09-17T01:52:30Z

test/jdk/tools/jlink/plugins/CDSPluginTest.java

+        } else {
+            helper.checkImage(image, module, null, null,
+                      new String[] { subDir + "classes.jsa" });
+        }


The above change checking 64-bit platform should not be needed. On an unknown platform, isDefaultCDSArchiveSupported should return false. It only returns true on 64-bit supported platforms. Can you verfiy?

I just try it on LoongArch64 and mips64el.

The Platform.isDefaultCDSArchiveSupported() returns true.
So the above checking can not be removed.

Also, I just forgot add import jtreg.SkippedException.

…on supported 64-bit platforms

mlchung

Thanks for the change.

1996scarlet · 2021-09-17T02:21:37Z

/integrate

openjdk · 2021-09-17T02:23:21Z

@1996scarlet
Your change (at version 503406b) is now ready to be sponsored by a Committer.

calvinccheung

Looks good and thanks for fixing this bug.

calvinccheung · 2021-09-17T16:41:02Z

/sponsor

openjdk · 2021-09-17T16:42:01Z

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

2f8c221: 8273681: Add Vector API vs Arrays.mismatch intrinsic benchmark
17f7a45: 8273913: Problem list some headful client jtreg tests that fail on macOS 12
27d747a: 8273877: os::unsetenv unused
35f6f1d: 8273808: Cleanup AddFontsToX11FontPath
1890d85: 8273872: ZGC: Explicitly use 2M large pages
54b4567: 8273880: Zero: Print warnings when unsupported intrinsics are enabled
e07ab82: 8273408: java.lang.AssertionError: typeSig ERROR on generated class property of record
8c022e2: 8270434: JDI+UT: Unexpected event in JDI tests
b982904: 8271073: Improve testing with VM option VerifyArchivedFields
bc48a0a: 8273902: Memory leak in OopStorage due to bug in OopHandle::release()
... and 15 more: https://git.openjdk.java.net/jdk/compare/74ffe12267cb3ae63072a06f50083fd0352d8049...master

Your commit was automatically rebased without conflicts.

openjdk · 2021-09-17T16:42:19Z

@calvinccheung @1996scarlet Pushed as commit 8302061.

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

bridgekeeper bot added the oca Needs verification of OCA signatory status label Sep 15, 2021

openjdk bot changed the title ~~8273774: jdk.tools.jlink.internal.Platform::is64Bit() should not hard…~~ 8273774: jdk.tools.jlink.internal.Platform::is64Bit() should not hard code for x64 and AARCH64 Sep 15, 2021

bridgekeeper bot added the oca-verify Needs verification of OCA signatory status label Sep 15, 2021

openjdk bot added the core-libs core-libs-dev@openjdk.org label Sep 15, 2021

bridgekeeper bot removed oca Needs verification of OCA signatory status oca-verify Needs verification of OCA signatory status labels Sep 15, 2021

openjdk bot added the rfr Pull request is ready for review label Sep 15, 2021

1996scarlet force-pushed the JDK-8273774 branch from 125c83e to 5ec04d4 Compare September 16, 2021 03:27

1996scarlet changed the title ~~8273774: jdk.tools.jlink.internal.Platform::is64Bit() should not hard code for x64 and AARCH64~~ 8273774: CDSPluginTest should only expect classes_nocoops.jsa exists on supported 64-bit platforms Sep 16, 2021

calvinccheung approved these changes Sep 16, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Sep 16, 2021

1996scarlet force-pushed the JDK-8273774 branch from 5ec04d4 to 587aeec Compare September 17, 2021 01:42

mlchung reviewed Sep 17, 2021

View reviewed changes

8273774: CDSPluginTest should only expect classes_nocoops.jsa exists …

503406b

…on supported 64-bit platforms

1996scarlet force-pushed the JDK-8273774 branch from 587aeec to 503406b Compare September 17, 2021 02:11

mlchung approved these changes Sep 17, 2021

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Sep 17, 2021

calvinccheung approved these changes Sep 17, 2021

View reviewed changes

openjdk bot closed this Sep 17, 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 sponsor Pull request is ready to be sponsored labels Sep 17, 2021

1996scarlet deleted the JDK-8273774 branch September 18, 2021 09:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8273774: CDSPluginTest should only expect classes_nocoops.jsa exists on supported 64-bit platforms #5519

8273774: CDSPluginTest should only expect classes_nocoops.jsa exists on supported 64-bit platforms #5519

1996scarlet commented Sep 15, 2021 •

edited by openjdk bot

Loading

bridgekeeper bot commented Sep 15, 2021

1996scarlet commented Sep 15, 2021

bridgekeeper bot commented Sep 15, 2021

openjdk bot commented Sep 15, 2021

mlbridge bot commented Sep 15, 2021 •

edited

Loading

mlchung commented Sep 15, 2021

mlchung commented Sep 16, 2021 •

edited

Loading

calvinccheung commented Sep 16, 2021

openjdk bot commented Sep 16, 2021

openjdk bot commented Sep 16, 2021 •

edited

Loading

mlchung commented Sep 16, 2021

calvinccheung commented Sep 16, 2021

1996scarlet commented Sep 17, 2021

mlchung Sep 17, 2021

1996scarlet Sep 17, 2021

mlchung left a comment

1996scarlet commented Sep 17, 2021

openjdk bot commented Sep 17, 2021

calvinccheung left a comment

calvinccheung commented Sep 17, 2021

openjdk bot commented Sep 17, 2021

openjdk bot commented Sep 17, 2021

8273774: CDSPluginTest should only expect classes_nocoops.jsa exists on supported 64-bit platforms #5519

8273774: CDSPluginTest should only expect classes_nocoops.jsa exists on supported 64-bit platforms #5519

Conversation

1996scarlet commented Sep 15, 2021 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Sep 15, 2021

1996scarlet commented Sep 15, 2021

bridgekeeper bot commented Sep 15, 2021

openjdk bot commented Sep 15, 2021

mlbridge bot commented Sep 15, 2021 • edited Loading

Webrevs

mlchung commented Sep 15, 2021

mlchung commented Sep 16, 2021 • edited Loading

calvinccheung commented Sep 16, 2021

openjdk bot commented Sep 16, 2021

openjdk bot commented Sep 16, 2021 • edited Loading

mlchung commented Sep 16, 2021

calvinccheung commented Sep 16, 2021

1996scarlet commented Sep 17, 2021

mlchung Sep 17, 2021

Choose a reason for hiding this comment

1996scarlet Sep 17, 2021

Choose a reason for hiding this comment

mlchung left a comment

Choose a reason for hiding this comment

1996scarlet commented Sep 17, 2021

openjdk bot commented Sep 17, 2021

calvinccheung left a comment

Choose a reason for hiding this comment

calvinccheung commented Sep 17, 2021

openjdk bot commented Sep 17, 2021

openjdk bot commented Sep 17, 2021

1996scarlet commented Sep 15, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Sep 15, 2021 •

edited

Loading

mlchung commented Sep 16, 2021 •

edited

Loading

openjdk bot commented Sep 16, 2021 •

edited

Loading