Unregister cold connections, even in case of errors

When marking a peer as cold make sure to call unregisterOutboundConnection. Previously connections could be left in the connection manager without a corresponding hot or warm peer and without a snocket.
IntersectMBO · Oct 14, 2021 · 606833a · 606833a
1 parent e8d4d2d
commit 606833a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerStateActions.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerStateActions.hs
@@ -608,13 +608,16 @@ withPeerStateActions PeerStateActionsArguments {
           --
           WithSomeProtocolTemperature (WithHot MiniProtocolError{}) -> do
             traceWith spsTracer (PeerStatusChanged (HotToCold pchConnectionId))
+            _ <- unregisterOutboundConnection spsConnectionManager (remoteAddress pchConnectionId)
             atomically (writeTVar pchPeerState (PeerStatus PeerCold))
           WithSomeProtocolTemperature (WithWarm MiniProtocolError{}) -> do
             traceWith spsTracer (PeerStatusChanged (WarmToCold pchConnectionId))
+            _ <- unregisterOutboundConnection spsConnectionManager (remoteAddress pchConnectionId)
             atomically (writeTVar pchPeerState (PeerStatus PeerCold))
           WithSomeProtocolTemperature (WithEstablished MiniProtocolError{}) -> do
             -- update 'pchPeerState' and log (as the two other transition to
             -- cold state.
+            _ <- unregisterOutboundConnection spsConnectionManager (remoteAddress pchConnectionId)
             state <- atomically $ do
               peerState <- readTVar pchPeerState
               writeTVar pchPeerState (PeerStatus PeerCold)
@@ -839,13 +842,15 @@ withPeerStateActions PeerStateActionsArguments {
       case res of
         Nothing -> do
           Mux.stopMux pchMux
+          _ <- unregisterOutboundConnection spsConnectionManager (remoteAddress pchConnectionId)
           atomically (writeTVar pchPeerState (PeerStatus PeerCold))
           traceWith spsTracer (PeerStatusChangeFailure
                                 (HotToWarm pchConnectionId)
                                 TimeoutError)
           throwIO (DeactivationTimeout pchConnectionId)
 
         Just (SomeErrored errs) -> do
+          _ <- unregisterOutboundConnection spsConnectionManager (remoteAddress pchConnectionId)
           atomically (writeTVar pchPeerState (PeerStatus PeerCold))
           traceWith spsTracer (PeerStatusChangeFailure
                                 (HotToCold pchConnectionId)