Make sure we allways have a PeerGSV

Even without support for the keep alive protocol blockfetch still requires a corresponding PeerGSV per active peer.
IntersectMBO · Jul 7, 2020 · a5f12f8 · a5f12f8
1 parent e6ddc41
commit a5f12f8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/ouroboros-consensus/src/Ouroboros/Consensus/Network/NodeToNode.hs b/ouroboros-consensus/src/Ouroboros/Consensus/Network/NodeToNode.hs
@@ -33,6 +33,7 @@ module Ouroboros.Consensus.Network.NodeToNode (
 import           Codec.CBOR.Decoding (Decoder)
 import           Codec.CBOR.Encoding (Encoding)
 import           Codec.Serialise (Serialise)
+import           Control.Monad (forever)
 import           Control.Monad.Class.MonadTimer (MonadTimer)
 import           Control.Tracer
 import           Data.ByteString.Lazy (ByteString)
@@ -392,6 +393,7 @@ mkApps
      , Ord remotePeer
      , Exception e
      , LedgerSupportsProtocol blk
+     , TranslateNetworkProtocolVersion blk
      )
   => NodeKernel m remotePeer localPeer blk -- ^ Needed for bracketing only
   -> Tracers m remotePeer blk e
@@ -522,15 +524,23 @@ mkApps kernel Tracers {..} Codecs {..} genChainSyncTimeout Handlers {..} =
     aKeepAliveClient version them channel = do
       labelThisThread "KeepAliveClient"
       startTs <- newTVarM Nothing
-      bracketKeepAliveClient (getFetchClientRegistry kernel) them $ \dqCtx -> do
-        runPeerWithLimits
-          nullTracer
-          cKeepAliveCodec
-          (byteLimitsKeepAlive (const 0)) -- TODO: Real Bytelimits, see #1727
-          timeLimitsKeepAlive
-          channel
-          $ keepAliveClientPeer
-          $ hKeepAliveClient version them dqCtx (KeepAliveInterval 10) startTs
+      let version' = nodeToNodeProtocolVersion (Proxy @blk) version
+          kacApp = case version' of
+                        -- Version 1 and 2 doesn't support keep alive protocol but Blockfetch
+                        -- still requires a PeerGSV per peer.
+                        NodeToNodeV_1 -> \_ -> forever (threadDelay 1000) >> return ()
+                        NodeToNodeV_2 -> \_ -> forever (threadDelay 1000) >> return ()
+                        _             -> \dqCtx -> do
+                          runPeerWithLimits
+                            nullTracer
+                            cKeepAliveCodec
+                            (byteLimitsKeepAlive (const 0)) -- TODO: Real Bytelimits, see #1727
+                            timeLimitsKeepAlive
+                            channel
+                            $ keepAliveClientPeer
+                            $ hKeepAliveClient version them dqCtx (KeepAliveInterval 10) startTs
+
+      bracketKeepAliveClient (getFetchClientRegistry kernel) them kacApp
 
     aKeepAliveServer
       :: BlockNodeToNodeVersion blk

diff --git a/ouroboros-network/src/Ouroboros/Network/NodeToNode.hs b/ouroboros-network/src/Ouroboros/Network/NodeToNode.hs
@@ -226,7 +226,7 @@ nodeToNodeProtocols MiniProtocolParameters {
                         blockFetchPipeliningMax,
                         txSubmissionMaxUnacked
                       }
-                    protocols version =
+                    protocols _version =
   OuroborosApplication $ \connectionId shouldStopSTM ->
     case protocols connectionId shouldStopSTM of
       NodeToNodeProtocols {
@@ -238,12 +238,7 @@ nodeToNodeProtocols MiniProtocolParameters {
         [ chainSyncMiniProtocol chainSyncProtocol
         , blockFetchMiniProtocol blockFetchProtocol
         , txSubmissionMiniProtocol txSubmissionProtocol
-        ] <>
-        [ keepAliveMiniProtocol keepAliveProtocol
-        | case version of
-               NodeToNodeV_1 -> False
-               NodeToNodeV_2 -> False
-               _             -> True
+        , keepAliveMiniProtocol keepAliveProtocol
         ]
    where
     chainSyncMiniProtocol chainSyncProtocol = MiniProtocol {