From db0beb51788576565cef9534ad9490a4a498b544 Mon Sep 17 00:00:00 2001 From: Pawan Dhananjay Date: Wed, 13 Apr 2022 03:54:44 +0000 Subject: [PATCH] Poll shutdown timeout in rpc handler (#3153) ## Issue Addressed N/A ## Proposed Changes Previously, we were using `Sleep::is_elapsed()` to check if the shutdown timeout had triggered without polling the sleep. This PR polls the sleep timer. --- .../lighthouse_network/src/rpc/handler.rs | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/beacon_node/lighthouse_network/src/rpc/handler.rs b/beacon_node/lighthouse_network/src/rpc/handler.rs index b685c4334..ac39e0cec 100644 --- a/beacon_node/lighthouse_network/src/rpc/handler.rs +++ b/beacon_node/lighthouse_network/src/rpc/handler.rs @@ -137,7 +137,7 @@ enum HandlerState { /// /// While in this state the handler rejects new requests but tries to finish existing ones. /// Once the timer expires, all messages are killed. - ShuttingDown(Box), + ShuttingDown(Pin>), /// The handler is deactivated. A goodbye has been sent and no more messages are sent or /// received. Deactivated, @@ -252,7 +252,7 @@ where self.dial_queue.push((id, OutboundRequest::Goodbye(reason))); } - self.state = HandlerState::ShuttingDown(Box::new(sleep_until( + self.state = HandlerState::ShuttingDown(Box::pin(sleep_until( TInstant::now() + Duration::from_secs(SHUTDOWN_TIMEOUT_SECS as u64), ))); } @@ -539,14 +539,15 @@ where } // Check if we are shutting down, and if the timer ran out - if let HandlerState::ShuttingDown(delay) = &self.state { - if delay.is_elapsed() { - self.state = HandlerState::Deactivated; - debug!(self.log, "Handler deactivated"); - return Poll::Ready(ConnectionHandlerEvent::Close(RPCError::InternalError( - "Shutdown timeout", - ))); - } + if let HandlerState::ShuttingDown(delay) = &mut self.state { + match delay.as_mut().poll(cx) { + Poll::Ready(_) => { + self.state = HandlerState::Deactivated; + debug!(self.log, "Handler deactivated"); + return Poll::Ready(ConnectionHandlerEvent::Close(RPCError::Disconnected)); + } + Poll::Pending => {} + }; } // purge expired inbound substreams and send an error