Skip to content
This repository has been archived by the owner on Jul 17, 2024. It is now read-only.
/ jdk22u Public archive

8323782: Race: Thread::interrupt vs. AbstractInterruptibleChannel.begin #130

Closed

Conversation

reinrich
Copy link
Member

@reinrich reinrich commented Apr 5, 2024

Hi,

this PR contains a backport of commit openjdk/jdk@4018b2b.

I'd like to do the backport because jdk 22 is affected by the issue. The included test hangs without the change.
Besides it will reduce the noise in jck tests we're doing regularly (the test api/java_net/ServerSocket/AcceptInterruptibleTests_PlatformThreads fails sometimes because of the issue).

The original fix does not apply due to renaming of a local variable. Also the context differs because there's no postInterrupt method to be called.
Nevertheless I'd consider the risk low because of the small size of the fix.

Tested with the included test.

The fix passed our CI testing: JTReg tests: tier1-4 of hotspot and jdk. All of Langtools and jaxp. JCK, SPECjvm2008, SPECjbb2015, Renaissance Suite, and SAP specific tests.
Testing was done with fastdebug builds on the main platforms and also on Linux/PPC64le.


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-8323782 needs maintainer approval

Issue

  • JDK-8323782: Race: Thread::interrupt vs. AbstractInterruptibleChannel.begin (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 130

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk22u/pull/130.diff

Webrev

Link to Webrev Comment

Co-authored-by: Alan Bateman <alanb@openjdk.org>
Reviewed-by: alanb, dholmes
@bridgekeeper
Copy link

bridgekeeper bot commented Apr 5, 2024

👋 Welcome back rrich! 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
Copy link

openjdk bot commented Apr 5, 2024

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

8323782: Race: Thread::interrupt vs. AbstractInterruptibleChannel.begin

Reviewed-by: phh

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 30 new commits pushed to 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.

@openjdk openjdk bot changed the title Backport 4018b2b19629ddb8cd7a56e064dfef371f23e5fa 8323782: Race: Thread::interrupt vs. AbstractInterruptibleChannel.begin Apr 5, 2024
@openjdk
Copy link

openjdk bot commented Apr 5, 2024

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

@openjdk openjdk bot added the backport label Apr 5, 2024
@reinrich reinrich marked this pull request as ready for review April 8, 2024 09:20
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 8, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 8, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Apr 11, 2024

⚠️ @reinrich 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.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Apr 16, 2024
@reinrich
Copy link
Member Author

Thanks for reviewing.
/integrate

@openjdk
Copy link

openjdk bot commented Apr 18, 2024

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 18, 2024

@reinrich Pushed as commit 1188d40.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants