OMGeeky/tarpc
1
0
Fork 0
mirror of https://github.com/OMGeeky/tarpc.git synced 2026-02-23 15:49:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix poll_expired incorrectly returning Pending when there are no outstanding requests.

Browse Source
This commit is contained in:
Tim Kuehn
2021-10-08 22:01:57 -07:00
parent d78b24b631
commit 9e4c3a2b8b
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tarpc/src/server.rs
View File

@@ -333,6 +333,7 @@ where
type Item = Result<TrackedRequest<Req>, ChannelError<T::Error>>; type Item = Result<TrackedRequest<Req>, ChannelError<T::Error>>;
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> { fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
#[derive(Debug)]
enum ReceiverStatus { enum ReceiverStatus {
Ready, Ready,
Pending, Pending,
@@ -388,6 +389,11 @@ where
Poll::Pending => Pending, Poll::Pending => Pending,
}; };
tracing::trace!(
"Expired requests: {:?}, Inbound: {:?}",
expiration_status,
request_status
);
match (expiration_status, request_status) { match (expiration_status, request_status) {
(Ready, _) | (_, Ready) => continue, (Ready, _) | (_, Ready) => continue,
(Closed, Closed) => return Poll::Ready(None), (Closed, Closed) => return Poll::Ready(None),

9
tarpc/src/server/in_flight_requests.rs
View File

@@ -98,6 +98,11 @@ impl InFlightRequests {
&mut self, &mut self,
cx: &mut Context, cx: &mut Context,
) -> Poll<Option<Result<u64, tokio::time::error::Error>>> { ) -> Poll<Option<Result<u64, tokio::time::error::Error>>> {
if self.deadlines.is_empty() {
// TODO(https://github.com/tokio-rs/tokio/issues/4161)
// This is a workaround for DelayQueue not always treating this case correctly.
return Poll::Ready(None);
}
self.deadlines.poll_expired(cx).map_ok(|expired| { self.deadlines.poll_expired(cx).map_ok(|expired| {
if let Some(RequestData { if let Some(RequestData {
abort_handle, span, .. abort_handle, span, ..
@@ -184,6 +189,8 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn remove_request_doesnt_abort() { async fn remove_request_doesnt_abort() {
let mut in_flight_requests = InFlightRequests::default(); let mut in_flight_requests = InFlightRequests::default();
assert!(in_flight_requests.deadlines.is_empty());
let abort_registration = in_flight_requests let abort_registration = in_flight_requests
.start_request( .start_request(
0, 0,
@@ -198,9 +205,11 @@ mod tests {
in_flight_requests.poll_expired(&mut noop_context()), in_flight_requests.poll_expired(&mut noop_context()),
Poll::Pending Poll::Pending
); );
assert!(!in_flight_requests.deadlines.is_empty());
assert_matches!(in_flight_requests.remove_request(0), Some(_)); assert_matches!(in_flight_requests.remove_request(0), Some(_));
// Postcondition: No pending expirations // Postcondition: No pending expirations
assert!(in_flight_requests.deadlines.is_empty());
assert_matches!( assert_matches!(
in_flight_requests.poll_expired(&mut noop_context()), in_flight_requests.poll_expired(&mut noop_context()),
Poll::Ready(None) Poll::Ready(None)