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.

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 skipping incoming queue processing on EOF from the incoming stream. #672

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion core-client/transports/src/transports/duplex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ where
// Handle stream.
// Reads from stream and queues to incoming queue.
log::debug!("handle stream");
let mut stream_eof = false;
loop {
let response_str = match self.stream.as_mut().poll_next(cx) {
Poll::Ready(Some(response_str)) => response_str,
Expand All @@ -166,7 +167,9 @@ where
// can be shutdown. Reopening closed connections must
// be handled by the transport.
debug!("connection closed");
return Poll::Ready(Ok(()));
// We still have to process the incoming queue.
stream_eof = true;
break;
}
Poll::Pending => break,
};
Expand Down Expand Up @@ -269,6 +272,11 @@ where
}
}

// Input stream handling is done, the future is ready.
if stream_eof {
return Poll::Ready(Ok(()));
}

// Handle outgoing queue.
// Writes queued messages to sink.
log::debug!("handle outgoing");
Expand Down