8358496: Concurrent reading from Socket with timeout executes sequentially #25614
Conversation
|
👋 Welcome back alanb! A progress list of the required criteria for merging this PR into |
|
@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 11 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 |
|
@AlanBateman The following labels 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 lists. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
| assertThrows(SocketTimeoutException.class, | ||
| () -> s.getInputStream().read()); | ||
| int timeout = s.getSoTimeout(); | ||
| checkDuration(startMillis, timeout-100, timeout+20_000); |
There was a problem hiding this comment.
Maybe it would be worth noting here that if the bug isn't fixed, the last thread to call read() would have to wait for 200 seconds, which largely exceeds 22s?
There was a problem hiding this comment.
Okay, I can make the test method description a bit clearer on this point.
| try { | ||
| s.connect(remote, 10000); | ||
| } catch (ConnectException expected) { } | ||
| assertThrows(ConnectException.class, () -> s.connect(remote, 10000)); |
There was a problem hiding this comment.
Ah! Good - you're even fixing a bug here.
|
/integrate |
|
Going to push as commit 7838321.
Your commit was automatically rebased without conflicts. |
openjdk
bot
removed
ready
|
@AlanBateman Pushed as commit 7838321. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
If several threads attempt to read from a Socket's input stream at the same time then all but the winner will block trying to acquire the read lock. This is okay for untimed-reads but surprising for timed-reads as the timeout is only effective after acquiring the lock. The SocketImpl is changed so that the timeout applies to the total time waiting to acquire and read.
A new test is added to the existing java/net/Socket/Timeouts test. It is migrated from TestNG to a JUnit test as a drive-by change - it's mostly mechanical and the changes kept as minimal as possible.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/25614/head:pull/25614$ git checkout pull/25614Update a local copy of the PR:
$ git checkout pull/25614$ git pull https://git.openjdk.org/jdk.git pull/25614/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 25614View PR using the GUI difftool:
$ git pr show -t 25614Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/25614.diff
Using Webrev
Link to Webrev Comment