p2p-governor: minConnectTime computation

IntersectMBO · Jan 28, 2021 · eda86d3 · eda86d3
1 parent e912e5a
commit eda86d3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/EstablishedPeers.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/EstablishedPeers.hs
@@ -80,7 +80,7 @@ invariant EstablishedPeers { establishedReady,
      <> (Set.fromList (PSQ.keys nextActivateTimes))
      == Map.keysSet establishedStatus
 
-     -- there are ony warm peers in 'nextActiveTimes'
+     -- there are only warm peers in 'nextActiveTimes'
   && all (== PeerWarm)
          (Map.filterWithKey
            (\peeraddr _ -> PSQ.member peeraddr nextActivateTimes)

diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/EstablishedPeers.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/EstablishedPeers.hs
@@ -92,7 +92,11 @@ belowTarget actions
     -- If we could connect except that there are no peers currently available
     -- then we return the next wakeup time (if any)
   | numEstablishedPeers + numConnectInProgress < targetNumberOfEstablishedPeers
-  = GuardedSkip (Min <$> KnownPeers.minConnectTime knownPeers)
+  = GuardedSkip (Min <$> KnownPeers.minConnectTime
+                           (inProgressPromoteCold
+                             `Set.union`
+                             Map.keysSet (EstablishedPeers.toMap establishedPeers))
+                           knownPeers)
 
   | otherwise
   = GuardedSkip Nothing

diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/KnownPeers.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/KnownPeers.hs
@@ -352,12 +352,18 @@ setGossipTime peeraddrs time
 -- Tracking when we can (re)connect
 --
 
-minConnectTime :: Ord peeraddr => KnownPeers peeraddr -> Maybe Time
-minConnectTime KnownPeers {
+minConnectTime :: Ord peeraddr
+               => Set peeraddr
+               -- ^ peers that are either established or which we are
+               -- establishing a connection
+               -> KnownPeers peeraddr
+               -> Maybe Time
+minConnectTime establishedPeers
+               KnownPeers {
                    availableToConnect,
                    nextConnectTimes
                  }
-  | Set.null availableToConnect
+  | Set.null (availableToConnect Set.\\ establishedPeers)
   , Just (_k, t, _, _psq) <- PSQ.minView nextConnectTimes
   = Just t