-
Notifications
You must be signed in to change notification settings - Fork 5.8k
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
8310902: (fc) FileChannel.transferXXX async close and interrupt issues #14656
Conversation
👋 Welcome back alanb! A progress list of the required criteria for merging this PR into |
@AlanBateman The following label will be automatically applied to this pull request:
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. |
test/jdk/java/nio/channels/FileChannel/CloseDuringTransfer.java
Outdated
Show resolved
Hide resolved
Webrevs
|
*/ | ||
@ParameterizedTest | ||
@MethodSource("sources") | ||
void testInterruptTransferDuringTransferFrom(ReadableByteChannel src) throws Exception { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be instead testInterruptTransferDuringTransferFrom
for consistency with testInterruptDuringTransferTo
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a typo here, I can't quite see it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Last changes look good. Approved.
@AlanBateman 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:
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 20 new commits pushed to the
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 |
/integrate |
Going to push as commit f4b900b.
Your commit was automatically rebased without conflicts. |
@AlanBateman Pushed as commit f4b900b. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
This change fixes a number of bugs with FileChannel.transferTo/transerFrom that arise when the source or target channel is closed, or the thread is interrupted, during the transfer. More specifically:
The direct implementations operate on the raw file descriptor and don't prevent the target/source channel from being closed during the transfer. For this PR, the direct transferTo is limited to cases where the target is a FileChannel or SocketChannel. It could be extended to other SelChImpl implementations (SinkChannel, DatagramChannel) if needed, but they are less interesting at this time.
The transferTo/transferFrom methods are specified to throw ClosedByInterruptException after closing both channels. This is implemented inconsistently, and leaves one channel open in several cases.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/14656/head:pull/14656
$ git checkout pull/14656
Update a local copy of the PR:
$ git checkout pull/14656
$ git pull https://git.openjdk.org/jdk.git pull/14656/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 14656
View PR using the GUI difftool:
$ git pr show -t 14656
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/14656.diff
Webrev
Link to Webrev Comment