8344993: [21u] [REDO] Backport JDK-8327501 and JDK-8328366 to JDK 21 #1181

martinuy · 2024-11-25T22:17:04Z

Hi,

In this PR I back out 8341989 for 8327501 and 8328366 to be re-introduced to JDK 21u. I plan to propose a backport of 8342905 thereafter. Reversion of 8341989 was clean.

Thanks,
Martin.-

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
JDK-8344993 needs maintainer approval

Issue

JDK-8344993: [21u] [REDO] Backport JDK-8327501 and JDK-8328366 to JDK 21 (Bug - P4 - Approved)

Reviewers

Severin Gehwolf (@jerboaa - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1181

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

Using diff file

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

Using Webrev

Link to Webrev Comment

Revert "8341989: [21u] Back out JDK-8327501 and JDK-8328366" This reverts commit dfcd8d2.

bridgekeeper · 2024-11-25T22:17:59Z

👋 Welcome back mbalao! 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-25T22:18:48Z

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

8344993: [21u] [REDO] Backport JDK-8327501 and JDK-8328366 to JDK 21

Reviewed-by: sgehwolf

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

d383ba5: 8322809: SystemModulesMap::classNames and moduleNames arrays do not match the order
e569997: 8344628: Test TestEnableJVMCIProduct.java run with virtual thread intermittent fails
92aa77c: 8343285: java.lang.Process is unresponsive and CPU usage spikes to 100%
046c4aa: 8334475: UnsafeIntrinsicsTest.java#ZGenerationalDebug assert(!assert_on_failure) failed: Has low-order bits set
a803b5a: 8342409: [s390x] C1 unwind_handler fails to unlock synchronized methods with LM_MONITOR
5ac01de: 8345055: [21u] ProblemList failing rtm tests on ppc platforms
6b9ef8d: 8325906: Problemlist vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java#id1 until JDK-8320865 is fixed
2dd7317: 8333427: langtools/tools/javac/newlines/NewLineTest.java is failing on Japanese Windows

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

mlbridge · 2024-11-25T22:23:15Z

Webrevs

00: Full (67a36bde)

AlanBateman · 2024-11-26T08:57:03Z

src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java

-            if (sm == null)
-                return new ForkJoinWorkerThread(null, pool, true, false);
-            else if (isCommon)
+            if (sm != null && isCommon)


The check should be if (isCommon && JLA.allowSecurityManager()) as a SM can be set mid-flight even if it is super weird to do that.

I think this is what the backport of JDK-8342905 will do which Martin mentioned he'll do as a follow-up after this one.

jerboaa

LGTM

jerboaa · 2024-11-27T13:50:42Z

@martinuy Please fix the PR title mismatch.

openjdk · 2024-11-27T14:18:28Z

⚠️ @martinuy This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

martinuy · 2024-11-27T18:46:10Z

/approval request JDK 21u is affected by bug 8327501. I'd like to redo the fix for 8327501 and its follow up fix 8328366. I'll then propose 8342905 to fix a bug introduced by 8328366.

openjdk · 2024-11-27T18:47:02Z

@martinuy
8344993: The approval request has been created successfully.

jerboaa · 2024-11-27T19:45:30Z

@martinuy Please submit a dependent PR for 8328366 so that we can approve them both. Thanks.

martinuy · 2024-12-02T21:32:02Z

@jerboaa May I have an approval for this PR now that @franferrax proposed the follow up fix as a dependent PR? (see #1192)

GoeLin · 2024-12-03T08:15:41Z

Hi @jerboaa, @martinuy,
today is the last day before cut-off of the January update.
I'm not sure whether we should push this on last notice.

One other thing I wonder is that Oracle has not backported the follow-up
fix JDK-8342905 to 21.0.6-oracle. Has this been overseen, @AlanBateman?

jerboaa · 2024-12-03T09:16:36Z

Hi @jerboaa, @martinuy,
today is the last day before cut-off of the January update.
I'm not sure whether we should push this on last notice.

@GoeLin I've we get it in before ramp-down it still has the full rampdown-cycle (two months). So last notice is relative IMO. We've had fairly good testing on 21.0.5 for this and the follow up clears the issue causing the back-out. It would be good to have it in the January release as it fixes a class unloading issue in 21. I won't insist, though.

GoeLin · 2024-12-03T09:23:21Z

Well then let's go ahead.

jerboaa · 2024-12-03T09:25:13Z

/approve yes

openjdk · 2024-12-03T09:25:38Z

@jerboaa
8344993: The approval request has been approved.

martinuy · 2024-12-03T15:25:03Z

/integrate

openjdk · 2024-12-03T15:25:30Z

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

d383ba5: 8322809: SystemModulesMap::classNames and moduleNames arrays do not match the order
e569997: 8344628: Test TestEnableJVMCIProduct.java run with virtual thread intermittent fails
92aa77c: 8343285: java.lang.Process is unresponsive and CPU usage spikes to 100%
046c4aa: 8334475: UnsafeIntrinsicsTest.java#ZGenerationalDebug assert(!assert_on_failure) failed: Has low-order bits set
a803b5a: 8342409: [s390x] C1 unwind_handler fails to unlock synchronized methods with LM_MONITOR
5ac01de: 8345055: [21u] ProblemList failing rtm tests on ppc platforms
6b9ef8d: 8325906: Problemlist vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java#id1 until JDK-8320865 is fixed
2dd7317: 8333427: langtools/tools/javac/newlines/NewLineTest.java is failing on Japanese Windows

Your commit was automatically rebased without conflicts.

openjdk · 2024-12-03T15:25:37Z

@martinuy Pushed as commit 96a3a88.

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

8344993: [21u] Re-introduce 8327501 and 8328366 to the JDK

67a36bd

Revert "8341989: [21u] Back out JDK-8327501 and JDK-8328366" This reverts commit dfcd8d2.

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

AlanBateman reviewed Nov 26, 2024

View reviewed changes

jerboaa approved these changes Nov 27, 2024

View reviewed changes

martinuy changed the title ~~8344993: [21u] Re-introduce 8327501 and 8328366 to the JDK~~ 8344993: [21u] [REDO] Backport JDK-8327501 and JDK-8328366 to JDK 21 Nov 27, 2024

openjdk bot added the approval Requires approval; will be removed when approval is received label Nov 27, 2024

franferrax mentioned this pull request Dec 2, 2024

8342905: Thread.setContextClassloader from thread in FJP commonPool task no longer works after JDK-8327501 redux #1192

Closed

4 tasks

openjdk bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Dec 3, 2024

openjdk bot added the integrated Pull request has been integrated label Dec 3, 2024

openjdk bot closed this Dec 3, 2024

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

8344993: [21u] [REDO] Backport JDK-8327501 and JDK-8328366 to JDK 21 #1181

8344993: [21u] [REDO] Backport JDK-8327501 and JDK-8328366 to JDK 21 #1181

Uh oh!

Conversation

martinuy commented Nov 25, 2024 • 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 Nov 25, 2024

Uh oh!

openjdk bot commented Nov 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mlbridge bot commented Nov 25, 2024

Webrevs

Uh oh!

AlanBateman Nov 26, 2024

Choose a reason for hiding this comment

Uh oh!

jerboaa Nov 26, 2024

Choose a reason for hiding this comment

Uh oh!

jerboaa left a comment

Choose a reason for hiding this comment

Uh oh!

jerboaa commented Nov 27, 2024

Uh oh!

openjdk bot commented Nov 27, 2024

Uh oh!

martinuy commented Nov 27, 2024

Uh oh!

openjdk bot commented Nov 27, 2024

Uh oh!

jerboaa commented Nov 27, 2024

Uh oh!

martinuy commented Dec 2, 2024

Uh oh!

GoeLin commented Dec 3, 2024

Uh oh!

jerboaa commented Dec 3, 2024

Uh oh!

GoeLin commented Dec 3, 2024

Uh oh!

jerboaa commented Dec 3, 2024

Uh oh!

openjdk bot commented Dec 3, 2024

Uh oh!

martinuy commented Dec 3, 2024

Uh oh!

openjdk bot commented Dec 3, 2024

Uh oh!

openjdk bot commented Dec 3, 2024

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

martinuy commented Nov 25, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Nov 25, 2024 •

edited

Loading