policies: declare {min,max}ChainSyncTimeout in the policies module

IntersectMBO · May 7, 2024 · 5e23bb4 · 5e23bb4
1 parent 44899a7
commit 5e23bb4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/ouroboros-network/src/Ouroboros/Network/Diffusion/Configuration.hs b/ouroboros-network/src/Ouroboros/Network/Diffusion/Configuration.hs
@@ -36,7 +36,8 @@ import Ouroboros.Network.ConnectionManager.Core (defaultProtocolIdleTimeout,
            defaultResetTimeout, defaultTimeWaitTimeout)
 import Ouroboros.Network.Diffusion (P2P (..))
 import Ouroboros.Network.Diffusion.Policies (closeConnectionTimeout,
-           deactivateTimeout, peerMetricsConfiguration)
+           deactivateTimeout, maxChainSyncTimeout, minChainSyncTimeout,
+           peerMetricsConfiguration)
 import Ouroboros.Network.NodeToNode (MiniProtocolParameters (..),
            defaultMiniProtocolParameters)
 import Ouroboros.Network.PeerSelection.Governor.Types
@@ -115,7 +116,9 @@ defaultChainSyncTimeout = do
     --       enters the must reply state. A static per connection timeout
     --       leads to selection preassure for connections with a large
     --       timeout, see #4244.
-    mustReplyTimeout <- Just . realToFrac <$> randomRIO (135,269 :: Double)
+    mustReplyTimeout <- Just . realToFrac <$> randomRIO ( realToFrac minChainSyncTimeout :: Double
+                                                        , realToFrac maxChainSyncTimeout :: Double
+                                                        )
     return ChainSyncTimeout { canAwaitTimeout  = shortWait,
                               intersectTimeout = shortWait,
                               mustReplyTimeout,

diff --git a/ouroboros-network/src/Ouroboros/Network/Diffusion/Policies.hs b/ouroboros-network/src/Ouroboros/Network/Diffusion/Policies.hs
@@ -23,9 +23,10 @@ import Ouroboros.Network.PeerSelection.Governor.Types
 import Ouroboros.Network.PeerSelection.PeerMetric
 
 
--- | Timeout for 'spsDeactivateTimeout'.
+-- | Timeout for 'spsDeactivateTimeout' and churn hot to warm demotions.
 --
--- The maximal timeout on 'ChainSync' (in 'StMustReply' state) is @269s@.
+-- The maximal timeout on 'ChainSync' (in 'StMustReply' state) is @269s@,
+-- see `maxChainSyncTimeout` below.
 --
 deactivateTimeout :: DiffTime
 deactivateTimeout = 300
@@ -41,6 +42,18 @@ closeConnectionTimeout :: DiffTime
 closeConnectionTimeout = 120
 
 
+-- | Chain sync `mustReplayTimeout` lower bound.
+--
+minChainSyncTimeout :: DiffTime
+minChainSyncTimeout = 135
+
+
+-- | Chain sync `mustReplayTimeout` upper bound.
+--
+maxChainSyncTimeout :: DiffTime
+maxChainSyncTimeout = 269
+
+
 -- | Number of events tracked by 'PeerMetrics'.  This corresponds to one hour of
 -- blocks on mainnet.
 --