Skip to content
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.

Sign up for GitHub

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

fix(iroh-net): return Poll::Read(Ok(n)) when we have no relay URL or direct addresses in poll_send #2322

Merged
merged 3 commits into from
Jun 6, 2024
Merged

fix(iroh-net): return Poll::Read(Ok(n)) when we have no relay URL or direct addresses in poll_send #2322

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99269e7
return `Poll::Pending` when we have no relay URL or direct addresses …
ramfox May 23, 2024
cb6d75b
fix(iroh-net): return `Poll::Ready(Ok(n))` when we do not have an add…
ramfox Jun 5, 2024
e1b4905
Merge branch 'main' into fix/poll_send
ramfox Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions iroh-net/src/magicsock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,12 +531,20 @@ impl MagicSock {
}

if udp_addr.is_none() && relay_url.is_none() {
// Handle no addresses being available
warn!(node = %public_key.fmt_short(), "failed to send: no UDP or relay addr");
return Poll::Ready(Err(io::Error::new(
io::ErrorKind::NotConnected,
"no UDP or relay address available for node",
)));
// Returning an error here would lock up the entire `Endpoint`.
//
// If we returned `Poll::Pending`, the waker driving the `poll_send` will never get woken up.
//
// Our best bet here is to log an error and return `Poll::Ready(Ok(n))`.
//
// `n` is the number of consecutive transmits in this batch that are meant for the same destination (a destination that we have no addresses for, and so we can never actually send).
//
// When we return `Poll::Ready(Ok(n))`, we are effectively dropping those n messages, by lying to QUIC and saying they were sent.
// (If we returned `Poll::Ready(Ok(0))` instead, QUIC would loop to attempt to re-send those messages, blocking other traffic.)
//
// When `QUIC` gets no `ACK`s for those messages, the connection will eventually timeout.
error!(node = %public_key.fmt_short(), "failed to send: no UDP or relay addr");
return Poll::Ready(Ok(n));
}

if (udp_addr.is_none() || udp_pending) && (relay_url.is_none() || relay_pending) {
Expand All @@ -549,14 +557,16 @@ impl MagicSock {
}

if !relay_sent && !udp_sent && !pings_sent {
warn!(node = %public_key.fmt_short(), "failed to send: no UDP or relay addr");
// Returning an error here would lock up the entire `Endpoint`.
// Instead, log an error and return `Poll::Pending`, the connection will timeout.
let err = udp_error.unwrap_or_else(|| {
io::Error::new(
io::ErrorKind::NotConnected,
"no UDP or relay address available for node",
)
});
return Poll::Ready(Err(err));
error!(node = %public_key.fmt_short(), "{err:?}");
return Poll::Pending;
}

trace!(
Expand Down
Loading