Merge #3435

3435: Makes AcceptedConnectionsLimit configurable r=bolt12 a=bolt12 Co-authored-by: Armando Santos <armandoifsantos@gmail.com>
IntersectMBO · Dec 14, 2021 · 90f1a01 · 90f1a01
2 parents e31455e + 67c14d1
commit 90f1a01
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 2 deletions.
diff --git a/cardano-node/src/Cardano/Node/Configuration/POM.hs b/cardano-node/src/Cardano/Node/Configuration/POM.hs
@@ -44,7 +44,7 @@ import           Cardano.Tracing.Config
 import           Ouroboros.Consensus.Mempool.API (MempoolCapacityBytesOverride (..), MempoolCapacityBytes (..))
 import           Ouroboros.Consensus.Storage.LedgerDB.DiskPolicy (SnapshotInterval (..))
 import           Ouroboros.Network.Block (MaxSlotNo (..))
-import           Ouroboros.Network.NodeToNode (DiffusionMode (..))
+import           Ouroboros.Network.NodeToNode (DiffusionMode (..), AcceptedConnectionsLimit (..))
 import qualified Ouroboros.Consensus.Node as Consensus ( NetworkP2PMode (..) )
 
 data NetworkP2PMode = EnabledP2PMode | DisabledP2PMode
@@ -127,6 +127,9 @@ data NodeConfiguration
          --
        , ncTimeWaitTimeout       :: DiffTime
 
+         -- | Node AcceptedConnectionsLimit
+       , ncAcceptedConnectionsLimit :: !AcceptedConnectionsLimit
+
          -- P2P governor targets
        , ncTargetNumberOfRootPeers        :: Int
        , ncTargetNumberOfKnownPeers       :: Int
@@ -179,6 +182,9 @@ data PartialNodeConfiguration
        , pncProtocolIdleTimeout   :: !(Last DiffTime)
        , pncTimeWaitTimeout       :: !(Last DiffTime)
 
+         -- AcceptedConnectionsLimit
+       , pncAcceptedConnectionsLimit :: !(Last AcceptedConnectionsLimit)
+
          -- P2P governor targets
        , pncTargetNumberOfRootPeers        :: !(Last Int)
        , pncTargetNumberOfKnownPeers       :: !(Last Int)
@@ -241,6 +247,11 @@ instance FromJSON PartialNodeConfiguration where
       pncProtocolIdleTimeout   <- Last <$> v .:? "ProtocolIdleTimeout"
       pncTimeWaitTimeout       <- Last <$> v .:? "TimeWaitTimeout"
 
+
+      -- AcceptedConnectionsLimit
+      pncAcceptedConnectionsLimit
+        <- Last <$> v .:? "AcceptedConnectionsLimit"
+
       -- P2P Governor parameters, with conservative defaults.
       pncTargetNumberOfRootPeers        <- Last <$> v .:? "TargetNumberOfRootPeers"
       pncTargetNumberOfKnownPeers       <- Last <$> v .:? "TargetNumberOfKnownPeers"
@@ -279,6 +290,7 @@ instance FromJSON PartialNodeConfiguration where
            , pncMaybeMempoolCapacityOverride
            , pncProtocolIdleTimeout
            , pncTimeWaitTimeout
+           , pncAcceptedConnectionsLimit
            , pncTargetNumberOfRootPeers
            , pncTargetNumberOfKnownPeers
            , pncTargetNumberOfEstablishedPeers
@@ -420,6 +432,14 @@ defaultPartialNodeConfiguration =
     , pncMaybeMempoolCapacityOverride = mempty
     , pncProtocolIdleTimeout   = Last (Just 5)
     , pncTimeWaitTimeout       = Last (Just 60)
+    , pncAcceptedConnectionsLimit =
+        Last
+      $ Just
+      $ AcceptedConnectionsLimit
+        { acceptedConnectionsHardLimit = 512
+        , acceptedConnectionsSoftLimit = 384
+        , acceptedConnectionsDelay     = 5
+        }
     , pncTargetNumberOfRootPeers        = Last (Just 100)
     , pncTargetNumberOfKnownPeers       = Last (Just 100)
     , pncTargetNumberOfEstablishedPeers = Last (Just 50)
@@ -467,6 +487,9 @@ makeNodeConfiguration pnc = do
   ncTimeWaitTimeout <-
     lastToEither "Missing TimeWaitTimeout"
     $ pncTimeWaitTimeout pnc
+  ncAcceptedConnectionsLimit <-
+    lastToEither "Missing AcceptedConnectionsLimit" $
+      pncAcceptedConnectionsLimit pnc
   enableP2P <-
     lastToEither "Missing EnableP2P"
     $ pncEnableP2P pnc
@@ -499,6 +522,7 @@ makeNodeConfiguration pnc = do
              , ncMaybeMempoolCapacityOverride = getLast $ pncMaybeMempoolCapacityOverride pnc
              , ncProtocolIdleTimeout
              , ncTimeWaitTimeout
+             , ncAcceptedConnectionsLimit
              , ncTargetNumberOfRootPeers
              , ncTargetNumberOfKnownPeers
              , ncTargetNumberOfEstablishedPeers

diff --git a/cardano-node/src/Cardano/Node/Orphans.hs b/cardano-node/src/Cardano/Node/Orphans.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE NamedFieldPuns #-}
 
 {-# OPTIONS_GHC -Wno-orphans #-}
 
@@ -17,6 +18,7 @@ import           Cardano.BM.Data.Tracer (TracingVerbosity (..))
 import qualified Cardano.Chain.Update as Update
 import           Cardano.Ledger.Crypto (StandardCrypto)
 import qualified Cardano.Ledger.Shelley.CompactAddr as Shelley
+import           Ouroboros.Network.NodeToNode (AcceptedConnectionsLimit (..))
 
 instance FromJSON TracingVerbosity where
   parseJSON (String str) = case str of
@@ -42,3 +44,26 @@ instance FromJSON Update.ApplicationName where
   parseJSON invalid  =
     fail $ "Parsing of application name failed due to type mismatch. "
     <> "Encountered: " <> show invalid
+
+instance ToJSON AcceptedConnectionsLimit where
+  toJSON AcceptedConnectionsLimit
+          { acceptedConnectionsHardLimit
+          , acceptedConnectionsSoftLimit
+          , acceptedConnectionsDelay
+          } =
+    object [ "AcceptedConnectionsLimit" .=
+      object [ "hardLimit" .=
+                  toJSON acceptedConnectionsHardLimit
+             , "softLimit" .=
+                  toJSON acceptedConnectionsSoftLimit
+             , "delay" .=
+                  toJSON acceptedConnectionsDelay
+             ]
+           ]
+
+instance FromJSON AcceptedConnectionsLimit where
+  parseJSON = withObject "AcceptedConnectionsLimit" $ \v ->
+    AcceptedConnectionsLimit
+      <$> v .: "hardLimit"
+      <*> v .: "softLimit"
+      <*> v .: "delay"
diff --git a/cardano-node/src/Cardano/Node/Parsers.hs b/cardano-node/src/Cardano/Node/Parsers.hs
@@ -97,6 +97,7 @@ nodeRunParser = do
            , pncMaybeMempoolCapacityOverride = maybeMempoolCapacityOverride
            , pncProtocolIdleTimeout = mempty
            , pncTimeWaitTimeout = mempty
+           , pncAcceptedConnectionsLimit = mempty
            , pncTargetNumberOfRootPeers = mempty
            , pncTargetNumberOfKnownPeers = mempty
            , pncTargetNumberOfEstablishedPeers = mempty

diff --git a/cardano-node/test/Test/Cardano/Node/POM.hs b/cardano-node/test/Test/Cardano/Node/POM.hs
@@ -13,7 +13,8 @@ import           Cardano.Node.Configuration.POM
 import           Cardano.Node.Types
 import           Cardano.Tracing.Config (TraceOptions (..))
 import           Ouroboros.Network.Block (MaxSlotNo (..), SlotNo (..))
-import           Ouroboros.Network.NodeToNode (DiffusionMode (InitiatorAndResponderDiffusionMode))
+import           Ouroboros.Network.NodeToNode (DiffusionMode (InitiatorAndResponderDiffusionMode),
+                   AcceptedConnectionsLimit(..))
 import           Ouroboros.Consensus.Storage.LedgerDB.DiskPolicy (SnapshotInterval (..))
 import qualified Ouroboros.Consensus.Node as Consensus ( NetworkP2PMode (..) )
 
@@ -69,6 +70,7 @@ testPartialYamlConfig =
     , pncMaybeMempoolCapacityOverride = mempty
     , pncProtocolIdleTimeout = mempty
     , pncTimeWaitTimeout = mempty
+    , pncAcceptedConnectionsLimit = mempty
     , pncTargetNumberOfRootPeers = mempty
     , pncTargetNumberOfKnownPeers = mempty
     , pncTargetNumberOfEstablishedPeers = mempty
@@ -104,6 +106,7 @@ testPartialCliConfig =
     , pncMaybeMempoolCapacityOverride = mempty
     , pncProtocolIdleTimeout = mempty
     , pncTimeWaitTimeout = mempty
+    , pncAcceptedConnectionsLimit = mempty
     , pncTargetNumberOfRootPeers = mempty
     , pncTargetNumberOfKnownPeers = mempty
     , pncTargetNumberOfEstablishedPeers = mempty
@@ -140,6 +143,12 @@ expectedConfig =
     , ncMaybeMempoolCapacityOverride = Nothing
     , ncProtocolIdleTimeout = 5
     , ncTimeWaitTimeout = 60
+    , ncAcceptedConnectionsLimit =
+        AcceptedConnectionsLimit
+          { acceptedConnectionsHardLimit = 512
+          , acceptedConnectionsSoftLimit = 384
+          , acceptedConnectionsDelay     = 5
+          }
     , ncTargetNumberOfRootPeers = 100
     , ncTargetNumberOfKnownPeers = 100
     , ncTargetNumberOfEstablishedPeers = 50