Skip to content
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

8298108: Add a regression test for JDK-8297684 #269

Closed

Conversation

jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Feb 27, 2023

Please review this backport of the regression test for a critical fix which we've included with the January CPU update. The fix was https://bugs.openjdk.org/browse/JDK-8280890

This patch adds an additional regression test which was seen in the wild with JDK 17. The patch isn't clean since the test library in jdk8u is different so needed a bit of a different setup routine for getting the jar with the provider created. Additionally, in jdk 8 the property to add providers is setting java.ext.dirs=... over java.locale.providers=SPI in later JDKs.

Testing: The test passes for me on the current dev tree and fails with the fix from JDK-8280890 reverted.

Thoughts?


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

Issues

  • JDK-8298108: Add a regression test for JDK-8297684
  • JDK-8298271: java/security/SignedJar/spi-calendar-provider/TestSPISigned.java failing on Windows

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/269/head:pull/269
$ git checkout pull/269

Update a local copy of the PR:
$ git checkout pull/269
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/269/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 269

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/269.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 27, 2023

👋 Welcome back sgehwolf! 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 openjdk bot changed the title Backport 4da8411674b7515310000bd8243860bc73f9a03d 8298108: Add a regression test for JDK-8297684 Feb 27, 2023
@openjdk
Copy link

openjdk bot commented Feb 27, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Feb 27, 2023
@mlbridge
Copy link

mlbridge bot commented Feb 27, 2023

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Lgtm.

@openjdk
Copy link

openjdk bot commented Mar 1, 2023

@jerboaa This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8298108: Add a regression test for JDK-8297684
8298271: java/security/SignedJar/spi-calendar-provider/TestSPISigned.java failing on Windows

Reviewed-by: phh, andrew

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

  • 54208fc: 8305975: Add TWCA Global Root CA
  • 20b4c70: 8072678: Wrong exception messages in java.awt.color.ICC_ColorSpace
  • 764dbd5: 8307310: Backport the tests for JDK-8058969 and JDK-8039271 to the OpenJDK8
  • 8562298: 8268558: [TESTBUG] Case 2 in TestP11KeyFactoryGetRSAKeySpec is skipped
  • c7c080a: 8285515: (dc) DatagramChannel.disconnect fails with "Invalid argument" on macOS 12.4
  • 3e69b49: 8307531: [aarch64] JDK8 single-step debugging is extremely slow
  • 4328fec: 8303028: Update system property for Java SE specification maintenance version
  • 3d9e8d0: 8305681: Allow additional characters for GB18030-2022 (Level 2) support
  • 9740c24: 8301400: Allow additional characters for GB18030-2022 support
  • 3147b1b: 8305165: [8u] ServiceThread::nmethods_do is not called to keep nmethods from being zombied while in the queue
  • ... and 44 more: https://git.openjdk.org/jdk8u-dev/compare/b51619d24e0643aa0afdba87ac20b371dbb594e8...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 openjdk bot added the ready Pull request is ready to be integrated label Mar 1, 2023
@jerboaa
Copy link
Contributor Author

jerboaa commented Mar 3, 2023

Thanks for the review, Paul!

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 31, 2023

@jerboaa This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@jerboaa
Copy link
Contributor Author

jerboaa commented Apr 3, 2023

Please keep it open, bot.

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

I've queried a couple of minor issues, but generally looks like a good conversion to 8u. It does seem that installing the provider in 8u is quite awkward. Is there no way to do it with just the JAR?

@gnu-andrew
Copy link
Member

gnu-andrew commented Apr 4, 2023

We should also probably reference JDK-8298271 in this PR to make it clear that the issue is also resolved for 8u (it was effectively "fixed" by not using a hardcoded path separator in the first place)

@jerboaa
Copy link
Contributor Author

jerboaa commented Apr 4, 2023

/issue add JDK-8298271

@openjdk
Copy link

openjdk bot commented Apr 4, 2023

@jerboaa
Adding additional issue to issue list: 8298271: java/security/SignedJar/spi-calendar-provider/TestSPISigned.java failing on Windows.

@jerboaa
Copy link
Contributor Author

jerboaa commented Apr 4, 2023

It does seem that installing the provider in 8u is quite awkward. Is there no way to do it with just the JAR?

Agreed. I couldn't get it to work otherwise, though. The calendar providing jar needs to be in the java.ext.dirs list of directories and the jar have the service provider (via ServiceLoader).

@jerboaa
Copy link
Contributor Author

jerboaa commented Apr 4, 2023

We should also probably reference JDK-8298271 in this PR to make it clear that the issue is also resolved for 8u (it was effectively "fixed" by not using a hardcoded path separator in the first place)

Done.

@jerboaa
Copy link
Contributor Author

jerboaa commented Apr 19, 2023

@gnu-andrew Is there anything else you need my action on?

@bridgekeeper
Copy link

bridgekeeper bot commented May 17, 2023

@jerboaa This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@jerboaa
Copy link
Contributor Author

jerboaa commented May 19, 2023

@gnu-andrew Ping? Could you please take another look. Thanks!

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

No, nothing more needed, only just seen the updated version. Looks fine now, sorry for the delay!
Approved for 8u.

@jerboaa
Copy link
Contributor Author

jerboaa commented May 25, 2023

Thanks for taking a look!

/integrate

@openjdk
Copy link

openjdk bot commented May 25, 2023

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

  • 54208fc: 8305975: Add TWCA Global Root CA
  • 20b4c70: 8072678: Wrong exception messages in java.awt.color.ICC_ColorSpace
  • 764dbd5: 8307310: Backport the tests for JDK-8058969 and JDK-8039271 to the OpenJDK8
  • 8562298: 8268558: [TESTBUG] Case 2 in TestP11KeyFactoryGetRSAKeySpec is skipped
  • c7c080a: 8285515: (dc) DatagramChannel.disconnect fails with "Invalid argument" on macOS 12.4
  • 3e69b49: 8307531: [aarch64] JDK8 single-step debugging is extremely slow
  • 4328fec: 8303028: Update system property for Java SE specification maintenance version
  • 3d9e8d0: 8305681: Allow additional characters for GB18030-2022 (Level 2) support
  • 9740c24: 8301400: Allow additional characters for GB18030-2022 support
  • 3147b1b: 8305165: [8u] ServiceThread::nmethods_do is not called to keep nmethods from being zombied while in the queue
  • ... and 44 more: https://git.openjdk.org/jdk8u-dev/compare/b51619d24e0643aa0afdba87ac20b371dbb594e8...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 25, 2023

@jerboaa Pushed as commit 29ba98e.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
3 participants