Skip to content

Close channel first before return undeliverable and remove log #1879

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

Closed
wants to merge 1 commit into from
Closed

Close channel first before return undeliverable and remove log #1879

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions hyperactor/src/channel/net/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,8 @@ async fn run<M: RemoteMessage>(
// TODO(T233029051): Return reason through return_channel too.
reason: _,
} => {
// Close the channel to prevent any further messages from being sent.
receiver.close();
// Return in order from oldest to newest, messages
// either not acknowledged or not sent.
unacked
Expand All @@ -584,9 +586,7 @@ async fn run<M: RemoteMessage>(
.chain(outbox.deque.drain(..))
.for_each(|queued| queued.try_return());
while let Ok((msg, return_channel, _)) = receiver.try_recv() {
if let Err(m) = return_channel.send(SendError(ChannelError::Closed, msg)) {
tracing::warn!("failed to deliver SendError: {}", m);
}
let _ = return_channel.send(SendError(ChannelError::Closed, msg));
}
}
_ => (),
Expand Down