peer-state-actions: Set the peer as warm before monitoring

The peer status must be set to PeerWarm before we start the monitoring thread. Previously we started the monitoring thread first which meant that it was possible for the monitor thread to notice an error and set the peer status to PeerCold only to have it overwritten with PeerWarm. This caused peers to get stuck in warm/hot without a corresponding connection.
IntersectMBO · Oct 20, 2021 · 5c16ff2 · 5c16ff2
1 parent 59d7cfd
commit 5c16ff2
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerStateActions.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerStateActions.hs
@@ -667,6 +667,14 @@ withPeerStateActions PeerStateActionsArguments {
                                             awaitVarBundle
                       }
 
+              startProtocols TokWarm connHandle
+              startProtocols TokEstablished connHandle
+              atomically $ writeTVar peerStateVar (PeerStatus PeerWarm)
+              traceWith spsTracer (PeerStatusChanged
+                                    (ColdToWarm
+                                      (Just localAddress)
+                                      remoteAddress))
+
               JobPool.forkJob jobPool
                               (Job (handleJust
                                      (\e -> case fromException e of
@@ -679,13 +687,6 @@ withPeerStateActions PeerStateActionsArguments {
                                    (return . Just)
                                    ()
                                    ("peerMonitoringLoop " ++ show remoteAddress))
-              startProtocols TokWarm connHandle
-              startProtocols TokEstablished connHandle
-              atomically $ writeTVar peerStateVar (PeerStatus PeerWarm)
-              traceWith spsTracer (PeerStatusChanged
-                                    (ColdToWarm
-                                      (Just localAddress)
-                                      remoteAddress))
               pure connHandle
 
             Disconnected _ Nothing ->