peer-selection: removed localRoots from counters

`localRoots` didn't count local connections, but the targets. We don't expose other targets in EKG metrics, so there's no reason to actually include local root targets.
IntersectMBO · May 7, 2024 · 38d17e4 · 38d17e4
1 parent 88d585e
commit 38d17e4
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 41 deletions.
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection.hs
@@ -3302,7 +3302,7 @@ selectGovState :: Eq a
 selectGovState f =
     Signal.nub
   -- TODO: #3182 Rng seed should come from quickcheck.
-  . Signal.fromChangeEvents (f $! Governor.emptyPeerSelectionState (mkStdGen 42) [])
+  . Signal.fromChangeEvents (f $! Governor.emptyPeerSelectionState (mkStdGen 42))
   . Signal.selectEvents
       (\case GovernorDebug (TraceGovernorState _ _ st) -> Just $! f st
              _                                         -> Nothing)
@@ -3346,8 +3346,8 @@ _governorFindingPublicRoots targetNumberOfRootPeers readDomains readUseBootstrap
       readDomains
       (ioDNSActions LookupReqAAndAAAA) $ \requestPublicRootPeers -> do
         publicStateVar <- makePublicPeerSelectionStateVar
-        debugVar <- newTVarIO $ emptyPeerSelectionState (mkStdGen 42) []
-        countersVar <- newTVarIO $ emptyPeerSelectionCounters []
+        debugVar <- newTVarIO $ emptyPeerSelectionState (mkStdGen 42)
+        countersVar <- newTVarIO emptyPeerSelectionCounters
         peerSelectionGovernor
           tracer tracer tracer
           -- TODO: #3182 Rng seed should come from quickcheck.

diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs
@@ -211,8 +211,8 @@ governorAction mockEnv = do
                              (ledgerStateJudgement mockEnv)
     usbVar <- playTimedScript (contramap TraceEnvSetUseBootstrapPeers tracerMockEnv)
                              (useBootstrapPeers mockEnv)
-    debugVar <- StrictTVar.newTVarIO (emptyPeerSelectionState (mkStdGen 42) [])
-    countersVar <- StrictTVar.newTVarIO (emptyPeerSelectionCounters [])
+    debugVar <- StrictTVar.newTVarIO (emptyPeerSelectionState (mkStdGen 42))
+    countersVar <- StrictTVar.newTVarIO emptyPeerSelectionCounters
     policy  <- mockPeerSelectionPolicy                mockEnv
     actions <- mockPeerSelectionActions tracerMockEnv mockEnv (readTVar usbVar) (readTVar lsjVar) policy
     exploreRaces      -- explore races within the governor

diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet.hs
@@ -3875,7 +3875,7 @@ selectDiffusionPeerSelectionState :: Eq a
 selectDiffusionPeerSelectionState f =
     Signal.nub
   -- TODO: #3182 Rng seed should come from quickcheck.
-  . Signal.fromChangeEvents (f $ Governor.emptyPeerSelectionState (mkStdGen 42) [])
+  . Signal.fromChangeEvents (f $ Governor.emptyPeerSelectionState (mkStdGen 42))
   . Signal.selectEvents
       (\case
         DiffusionDebugPeerSelectionTrace (TraceGovernorState _ _ st) -> Just (f st)
@@ -3887,7 +3887,7 @@ selectDiffusionPeerSelectionState' :: Eq a
                                   -> Signal a
 selectDiffusionPeerSelectionState' f =
   -- TODO: #3182 Rng seed should come from quickcheck.
-    Signal.fromChangeEvents (f $ Governor.emptyPeerSelectionState (mkStdGen 42) [])
+    Signal.fromChangeEvents (f $ Governor.emptyPeerSelectionState (mkStdGen 42))
   . Signal.selectEvents
       (\case
         DiffusionDebugPeerSelectionTrace (TraceGovernorState _ _ st) -> Just (f st)

diff --git a/ouroboros-network/src/Ouroboros/Network/Diffusion/P2P.hs b/ouroboros-network/src/Ouroboros/Network/Diffusion/P2P.hs
@@ -810,7 +810,7 @@ runM Interfaces
             min 2 (targetNumberOfActivePeers daPeerSelectionTargets)
         }
 
-      countersVar <- newTVarIO (emptyPeerSelectionCounters [])
+      countersVar <- newTVarIO emptyPeerSelectionCounters
 
       -- Design notes:
       --  - We split the following code into two parts:
@@ -1064,7 +1064,7 @@ runM Interfaces
         -- InitiatorOnly mode, run peer selection only:
         InitiatorOnlyDiffusionMode ->
           withConnectionManagerInitiatorOnlyMode $ \connectionManager-> do
-          debugStateVar <- newTVarIO $ emptyPeerSelectionState fuzzRng []
+          debugStateVar <- newTVarIO $ emptyPeerSelectionState fuzzRng
           diInstallSigUSR1Handler connectionManager debugStateVar daPeerMetrics
           withPeerStateActions' connectionManager $ \peerStateActions->
             withPeerSelectionActions'
@@ -1089,7 +1089,7 @@ runM Interfaces
             inboundInfoChannel $ \connectionManager->
               withSockets' $ \sockets addresses -> do
                 withServer sockets connectionManager inboundInfoChannel $ \inboundGovernorThread readInboundState -> do
-                  debugStateVar <- newTVarIO $ emptyPeerSelectionState fuzzRng []
+                  debugStateVar <- newTVarIO $ emptyPeerSelectionState fuzzRng
                   diInstallSigUSR1Handler connectionManager debugStateVar daPeerMetrics
                   withPeerStateActions' connectionManager $ \peerStateActions ->
                     withPeerSelectionActions'

diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs
@@ -459,9 +459,7 @@ peerSelectionGovernor :: ( Alternative (STM m)
                       -> PeerSelectionPolicy  peeraddr m
                       -> m Void
 peerSelectionGovernor tracer debugTracer countersTracer fuzzRng countersVar publicStateVar debugStateVar actions policy =
-    JobPool.withJobPool $ \jobPool -> do
-      localPeers <- map (\(w, h, _) -> (w, h))
-                <$> atomically (readLocalRootPeers actions)
+    JobPool.withJobPool $ \jobPool ->
       peerSelectionGovernorLoop
         tracer
         debugTracer
@@ -472,7 +470,7 @@ peerSelectionGovernor tracer debugTracer countersTracer fuzzRng countersVar publ
         actions
         policy
         jobPool
-        (emptyPeerSelectionState fuzzRng localPeers)
+        (emptyPeerSelectionState fuzzRng)
 
 -- | Our pattern here is a loop with two sets of guarded actions:
 --

diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs
@@ -38,7 +38,7 @@ module Ouroboros.Network.PeerSelection.Governor.Types
   , TimedDecision
   , MkGuardedDecision
   , Completion (..)
-  , PeerSelectionCounters (.., PeerSelectionCountersHWC, numberOfColdPeers, numberOfWarmPeers, numberOfHotPeers, numberOfColdBigLedgerPeers, numberOfWarmBigLedgerPeers, numberOfHotBigLedgerPeers, numberOfColdLocalRootPeers, numberOfWarmLocalRootPeers, numberOfHotLocalRootPeers, localRootsHWC)
+  , PeerSelectionCounters (.., PeerSelectionCountersHWC, numberOfColdPeers, numberOfWarmPeers, numberOfHotPeers, numberOfColdBigLedgerPeers, numberOfWarmBigLedgerPeers, numberOfHotBigLedgerPeers, numberOfColdLocalRootPeers, numberOfWarmLocalRootPeers, numberOfHotLocalRootPeers)
   , emptyPeerSelectionCounters
   , peerSelectionStateToCounters
     -- * Peer Sharing Auxiliary data type
@@ -633,11 +633,6 @@ data PeerSelectionCounters = PeerSelectionCounters {
       numberOfActiveLocalRootPeers          :: Int,
       numberOfActiveLocalRootPeersDemotions :: Int,
 
-      -- | Local root peers with one entry per group. First entry is the number
-      -- of warm peers in that group the second is the number of hot peers in
-      -- that group.
-      localRoots                            :: ![(HotValency, WarmValency)],
-
       --
       -- Share Peers
       -- (peers received through peer sharing)
@@ -671,7 +666,6 @@ data PeerSelectionCounters = PeerSelectionCounters {
 pattern PeerSelectionCountersHWC :: Int -> Int -> Int -- peers
                                  -> Int -> Int -> Int -- big ledger peers
                                  -> Int -> Int -> Int -- local roots
-                                 -> [(HotValency, WarmValency)]
                                  -> PeerSelectionCounters
 pattern PeerSelectionCountersHWC { numberOfColdPeers,
                                    numberOfWarmPeers,
@@ -683,8 +677,7 @@ pattern PeerSelectionCountersHWC { numberOfColdPeers,
 
                                    numberOfColdLocalRootPeers,
                                    numberOfWarmLocalRootPeers,
-                                   numberOfHotLocalRootPeers,
-                                   localRootsHWC }
+                                   numberOfHotLocalRootPeers }
 
         <- (peerSelectionCountersHWC ->
              PeerSelectionCounters { numberOfKnownPeers                = numberOfColdPeers,
@@ -697,8 +690,8 @@ pattern PeerSelectionCountersHWC { numberOfColdPeers,
 
                                      numberOfKnownLocalRootPeers       = numberOfColdLocalRootPeers,
                                      numberOfEstablishedLocalRootPeers = numberOfWarmLocalRootPeers,
-                                     numberOfActiveLocalRootPeers      = numberOfHotLocalRootPeers,
-                                     localRoots                        = localRootsHWC })
+                                     numberOfActiveLocalRootPeers      = numberOfHotLocalRootPeers
+                                   })
 
 {-# COMPLETE PeerSelectionCountersHWC #-}
 
@@ -738,8 +731,6 @@ peerSelectionCountersHWC PeerSelectionCounters {..} =
       numberOfActiveLocalRootPeers,
       numberOfActiveLocalRootPeersDemotions,
 
-      localRoots,
-
       numberOfKnownSharedPeers                   = numberOfKnownSharedPeers
                                                  - numberOfEstablishedSharedPeers,
       numberOfColdSharedPeersPromotions,
@@ -810,8 +801,6 @@ peerSelectionStateToCounters
       numberOfActiveLocalRootPeers               = Set.size   activeLocalRootsPeersSet,
       numberOfActiveLocalRootPeersDemotions      = Set.size $ activeLocalRootsPeersSet `Set.intersection` inProgressDemoteHot,
 
-      localRoots,
-
       numberOfKnownSharedPeers                   = Set.size   knownSharedPeersSet,
       numberOfColdSharedPeersPromotions          = Set.size $ knownSharedPeersSet `Set.intersection` inProgressPromoteCold,
       numberOfEstablishedSharedPeers             = Set.size   establishedSharedPeersSet,
@@ -844,10 +833,6 @@ peerSelectionStateToCounters
     activeBigLedgerPeersSet      = activePeers `Set.intersection` bigLedgerSet
 
     -- local roots
-    localRoots =
-      [ (hot, warm)
-      | (hot, warm, _) <- LocalRootPeers.toGroupSets localRootPeers
-      ]
     localRootSet                  = LocalRootPeers.keysSet localRootPeers
     -- local roots and big ledger peers are disjoint, hence we can use
     -- `knownPeersSet`, `establishedPeersSet` and `activePeersSet` below.
@@ -872,9 +857,8 @@ peerSelectionStateToCounters
 
 
 
-emptyPeerSelectionCounters :: [(HotValency, WarmValency)]
-                           -> PeerSelectionCounters
-emptyPeerSelectionCounters localRoots =
+emptyPeerSelectionCounters :: PeerSelectionCounters
+emptyPeerSelectionCounters =
   PeerSelectionCounters {
     numberOfRootPeers                     = 0,
 
@@ -908,8 +892,6 @@ emptyPeerSelectionCounters localRoots =
     numberOfActiveLocalRootPeers          = 0,
     numberOfActiveLocalRootPeersDemotions = 0,
 
-    localRoots,
-
     numberOfKnownSharedPeers              = 0,
     numberOfColdSharedPeersPromotions     = 0,
     numberOfEstablishedSharedPeers        = 0,
@@ -920,9 +902,8 @@ emptyPeerSelectionCounters localRoots =
   }
 
 emptyPeerSelectionState :: StdGen
-                        -> [(HotValency, WarmValency)]
                         -> PeerSelectionState peeraddr peerconn
-emptyPeerSelectionState rng localRoots =
+emptyPeerSelectionState rng =
     PeerSelectionState {
       targets                     = nullPeerSelectionTargets,
       localRootPeers              = LocalRootPeers.empty,
@@ -943,7 +924,7 @@ emptyPeerSelectionState rng localRoots =
       inProgressDemoteHot         = Set.empty,
       inProgressDemoteToCold      = Set.empty,
       stdGen                      = rng,
-      countersCache               = Cache (emptyPeerSelectionCounters localRoots),
+      countersCache               = Cache emptyPeerSelectionCounters,
       ledgerStateJudgement        = TooOld,
       bootstrapPeersFlag          = DontUseBootstrapPeers,
       hasOnlyBootstrapPeers       = False,