Don't ignore EAGAIN in UDS connect call #1564
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Thomasdezeeuw
commented
Apr 10, 2022
| @@ -13,7 +13,7 @@ pub(crate) fn connect(path: &Path) -> io::Result<net::UnixStream> { | |||
|
|
|||
| match syscall!(connect(socket, sockaddr, socklen)) { | |||
| Ok(_) => {} | |||
| Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {} | |||
| Err(ref err) if err.raw_os_error() == Some(libc::EINPROGRESS) => {} | |||
There was a problem hiding this comment.
I've added EINPROGRESS instead because I can't really tell from the macOS manual if they guarantee that EAGAIN is always returned (unlike e.g. Linux).
There was a problem hiding this comment.
Unfortunately I can't tell either; that manual isn't great.
Noah-Kennedy
approved these changes
Apr 10, 2022
| @@ -13,7 +13,7 @@ pub(crate) fn connect(path: &Path) -> io::Result<net::UnixStream> { | |||
|
|
|||
| match syscall!(connect(socket, sockaddr, socklen)) { | |||
| Ok(_) => {} | |||
| Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {} | |||
| Err(ref err) if err.raw_os_error() == Some(libc::EINPROGRESS) => {} | |||
There was a problem hiding this comment.
Unfortunately I can't tell either; that manual isn't great.
Per the Linux manual: > EAGAIN For nonblocking UNIX domain sockets, the socket is > nonblocking, and the connection cannot be completed > immediately. Previously the code incorrectly assumed that the connection was now in progress, which is incorrect. If that were the case EINPROGRESS would/should be returned by the OS
This is a reflect of the Linux manual, which unfortunately doesn't specify how to determine when the connect call should be retried.
Thomasdezeeuw
force-pushed
the
issue#1560
branch
from
d13f7c5
to
a448934
Compare
|
Thanks @Thomasdezeeuw ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Per the Linux manual:
Previously the code incorrectly assumed that the connection was now in
progress, which is incorrect. If that were the case EINPROGRESS
would/should be returned by the OS.
Also documents that connect calls can return a WouldBlock error.
This is a reflect of the Linux manual, which unfortunately doesn't
specify how to determine when the connect call should be retried.
Fixes #1560