Skip to content

Commit

Permalink
outbound-governor: renamed shared peers as non-root peers
Browse files Browse the repository at this point in the history 
This is less misleading, especially since ex-local root peers might fall
into that category, and they were never received through peer sharing.
  • Loading branch information
@coot
coot committed Apr 25, 2024
1 parent 204cba0 commit 43cbe72
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 81 deletions.
46 changes: 23 additions & 23 deletions ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,12 @@ prop_peerSelectionView_sizes env =
.&&. isSubsetProperty "viewAvailableToConnectLocalRootPeers" viewAvailableToConnectLocalRootPeers viewKnownLocalRootPeers
.&&. isSubsetProperty "viewWarmLocalRootPeersPromotions" viewWarmLocalRootPeersPromotions (viewEstablishedLocalRootPeers Set.\\ viewActiveLocalRootPeers)

.&&. isSubsetProperty "viewActiveSharedPeersDemotions" viewActiveSharedPeersDemotions viewActiveSharedPeers
.&&. isSubsetProperty "viewActiveSharedPeers" viewActiveSharedPeers viewEstablishedSharedPeers
.&&. isSubsetProperty "viewEstablishedSharedPeers" viewEstablishedSharedPeers viewKnownSharedPeers
.&&. isSubsetProperty "viewColdSharedPeersPromotions" viewColdSharedPeersPromotions viewKnownSharedPeers
.&&. isSubsetProperty "viewWarmSharedPeersPromotions" viewWarmSharedPeersPromotions (viewEstablishedSharedPeers Set.\\ viewActiveSharedPeers)
.&&. isSubsetProperty "viewWarmSharedPeersDemotions" viewWarmSharedPeersDemotions (viewEstablishedSharedPeers Set.\\ viewActiveSharedPeers)
.&&. isSubsetProperty "viewActiveNonRootPeersDemotions" viewActiveNonRootPeersDemotions viewActiveNonRootPeers
.&&. isSubsetProperty "viewActiveNonRootPeers" viewActiveNonRootPeers viewEstablishedNonRootPeers
.&&. isSubsetProperty "viewEstablishedNonRootPeers" viewEstablishedNonRootPeers viewKnownNonRootPeers
.&&. isSubsetProperty "viewColdNonRootPeersPromotions" viewColdNonRootPeersPromotions viewKnownNonRootPeers
.&&. isSubsetProperty "viewWarmNonRootPeersPromotions" viewWarmNonRootPeersPromotions (viewEstablishedNonRootPeers Set.\\ viewActiveNonRootPeers)
.&&. isSubsetProperty "viewWarmNonRootPeersDemotions" viewWarmNonRootPeersDemotions (viewEstablishedNonRootPeers Set.\\ viewActiveNonRootPeers)

.&&. isSubsetProperty "viewActiveBootstrapPeersDemotions" viewActiveBootstrapPeersDemotions viewActiveBootstrapPeers
.&&. isSubsetProperty "viewActiveBootstrapPeers" viewActiveBootstrapPeers viewEstablishedBootstrapPeers
Expand All @@ -270,14 +270,14 @@ prop_peerSelectionView_sizes env =

.&&. disjointSetsProperty "viewKnownPeers viewKnownBigLedgerPeers" viewKnownPeers viewKnownBigLedgerPeers
.&&. isSubsetProperty "viewKnownLocalRootPeers" viewKnownLocalRootPeers viewKnownPeers
.&&. isSubsetProperty "viewKnownSharedPeers" viewKnownSharedPeers viewKnownPeers
.&&. isSubsetProperty "viewKnownNonRootPeers" viewKnownNonRootPeers viewKnownPeers
.&&. isSubsetProperty "viewKnownBootstrapPeers" viewKnownBootstrapPeers viewKnownPeers

.&&. disjointSetsProperty "viewKnownLocalRootPeers-viewKnownBigLedgerPeers" viewKnownLocalRootPeers viewKnownBigLedgerPeers
.&&. disjointSetsProperty "viewKnownLocalRootPeers-viewKnownSharedPeers" viewKnownLocalRootPeers viewKnownSharedPeers
.&&. disjointSetsProperty "viewKnownLocalRootPeers-viewKnownNonRootPeers" viewKnownLocalRootPeers viewKnownNonRootPeers
.&&. disjointSetsProperty "viewKnownLocalRootPeers-viewKnownBootstrapPeers" viewKnownLocalRootPeers viewKnownBootstrapPeers

.&&. disjointSetsProperty "viewKnownSharedPeers-viewKnownBigLedgerPeers" viewKnownSharedPeers viewKnownBigLedgerPeers
.&&. disjointSetsProperty "viewKnownNonRootPeers-viewKnownBigLedgerPeers" viewKnownNonRootPeers viewKnownBigLedgerPeers
.&&. disjointSetsProperty "viewKnownBootstrapPeers-viewKnownBigLedgerPeers" viewKnownBootstrapPeers viewKnownBigLedgerPeers

viewSizeInvariant :: PeerSelectionSetsWithSizes PeerAddr
Expand Down Expand Up @@ -336,20 +336,20 @@ prop_peerSelectionView_sizes env =
.&&. counterexample "viewActiveLocalRootPeersDemotions"
(Set.size (fst viewActiveLocalRootPeersDemotions) === snd viewActiveLocalRootPeersDemotions)

.&&. counterexample "viewKnownSharedPeers"
(Set.size (fst viewKnownSharedPeers) === snd viewKnownSharedPeers)
.&&. counterexample "viewColdSharedPeersPromotions"
(Set.size (fst viewColdSharedPeersPromotions) === snd viewColdSharedPeersPromotions)
.&&. counterexample "viewEstablishedSharedPeers"
(Set.size (fst viewEstablishedSharedPeers) === snd viewEstablishedSharedPeers)
.&&. counterexample "viewWarmSharedPeersDemotions"
(Set.size (fst viewWarmSharedPeersDemotions) === snd viewWarmSharedPeersDemotions)
.&&. counterexample "viewWarmSharedPeersPromotions"
(Set.size (fst viewWarmSharedPeersPromotions) === snd viewWarmSharedPeersPromotions)
.&&. counterexample "viewActiveSharedPeers"
(Set.size (fst viewActiveSharedPeers) === snd viewActiveSharedPeers)
.&&. counterexample "viewActiveSharedPeersDemotions"
(Set.size (fst viewActiveSharedPeersDemotions) === snd viewActiveSharedPeersDemotions)
.&&. counterexample "viewKnownNonRootPeers"
(Set.size (fst viewKnownNonRootPeers) === snd viewKnownNonRootPeers)
.&&. counterexample "viewColdNonRootPeersPromotions"
(Set.size (fst viewColdNonRootPeersPromotions) === snd viewColdNonRootPeersPromotions)
.&&. counterexample "viewEstablishedNonRootPeers"
(Set.size (fst viewEstablishedNonRootPeers) === snd viewEstablishedNonRootPeers)
.&&. counterexample "viewWarmNonRootPeersDemotions"
(Set.size (fst viewWarmNonRootPeersDemotions) === snd viewWarmNonRootPeersDemotions)
.&&. counterexample "viewWarmNonRootPeersPromotions"
(Set.size (fst viewWarmNonRootPeersPromotions) === snd viewWarmNonRootPeersPromotions)
.&&. counterexample "viewActiveNonRootPeers"
(Set.size (fst viewActiveNonRootPeers) === snd viewActiveNonRootPeers)
.&&. counterexample "viewActiveNonRootPeersDemotions"
(Set.size (fst viewActiveNonRootPeersDemotions) === snd viewActiveNonRootPeersDemotions)

.&&. counterexample "viewKnownBootstrapPeers"
(Set.size (fst viewKnownBootstrapPeers) === snd viewKnownBootstrapPeers)
Expand Down
118 changes: 60 additions & 58 deletions ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ module Ouroboros.Network.PeerSelection.Governor.Types
numberOfActiveLocalRootPeers,
numberOfActiveLocalRootPeersDemotions,

numberOfKnownSharedPeers,
numberOfColdSharedPeersPromotions,
numberOfEstablishedSharedPeers,
numberOfWarmSharedPeersDemotions,
numberOfWarmSharedPeersPromotions,
numberOfActiveSharedPeers,
numberOfActiveSharedPeersDemotions,
numberOfKnownNonRootPeers,
numberOfColdNonRootPeersPromotions,
numberOfEstablishedNonRootPeers,
numberOfWarmNonRootPeersDemotions,
numberOfWarmNonRootPeersPromotions,
numberOfActiveNonRootPeers,
numberOfActiveNonRootPeersDemotions,

numberOfKnownBootstrapPeers,
numberOfColdBootstrapPeersPromotions,
Expand Down Expand Up @@ -698,17 +698,19 @@ data PeerSelectionView a = PeerSelectionView {
viewActiveLocalRootPeersDemotions :: a,

--
-- Share Peers
-- (peers received through peer sharing)
--

viewKnownSharedPeers :: a,
viewColdSharedPeersPromotions :: a,
viewEstablishedSharedPeers :: a,
viewWarmSharedPeersDemotions :: a,
viewWarmSharedPeersPromotions :: a,
viewActiveSharedPeers :: a,
viewActiveSharedPeersDemotions :: a,
-- Non-Root Peers
--

viewKnownNonRootPeers :: a,
-- ^ number of known non root peers. These are mostly peers received
-- through peer sharing (or light peer sharing); but also will contains
-- peers which used to be local roots after a reconfiguration.
viewColdNonRootPeersPromotions :: a,
viewEstablishedNonRootPeers :: a,
viewWarmNonRootPeersDemotions :: a,
viewWarmNonRootPeersPromotions :: a,
viewActiveNonRootPeers :: a,
viewActiveNonRootPeersDemotions :: a,

--
-- Bootstrap Peers
Expand Down Expand Up @@ -762,13 +764,13 @@ pattern PeerSelectionCounters {
numberOfActiveLocalRootPeers,
numberOfActiveLocalRootPeersDemotions,

numberOfKnownSharedPeers,
numberOfColdSharedPeersPromotions,
numberOfEstablishedSharedPeers,
numberOfWarmSharedPeersDemotions,
numberOfWarmSharedPeersPromotions,
numberOfActiveSharedPeers,
numberOfActiveSharedPeersDemotions,
numberOfKnownNonRootPeers,
numberOfColdNonRootPeersPromotions,
numberOfEstablishedNonRootPeers,
numberOfWarmNonRootPeersDemotions,
numberOfWarmNonRootPeersPromotions,
numberOfActiveNonRootPeers,
numberOfActiveNonRootPeersDemotions,

numberOfKnownBootstrapPeers,
numberOfColdBootstrapPeersPromotions,
Expand Down Expand Up @@ -808,13 +810,13 @@ pattern PeerSelectionCounters {
viewActiveLocalRootPeers = numberOfActiveLocalRootPeers,
viewActiveLocalRootPeersDemotions = numberOfActiveLocalRootPeersDemotions,

viewKnownSharedPeers = numberOfKnownSharedPeers,
viewColdSharedPeersPromotions = numberOfColdSharedPeersPromotions,
viewEstablishedSharedPeers = numberOfEstablishedSharedPeers,
viewWarmSharedPeersDemotions = numberOfWarmSharedPeersDemotions,
viewWarmSharedPeersPromotions = numberOfWarmSharedPeersPromotions,
viewActiveSharedPeers = numberOfActiveSharedPeers,
viewActiveSharedPeersDemotions = numberOfActiveSharedPeersDemotions,
viewKnownNonRootPeers = numberOfKnownNonRootPeers,
viewColdNonRootPeersPromotions = numberOfColdNonRootPeersPromotions,
viewEstablishedNonRootPeers = numberOfEstablishedNonRootPeers,
viewWarmNonRootPeersDemotions = numberOfWarmNonRootPeersDemotions,
viewWarmNonRootPeersPromotions = numberOfWarmNonRootPeersPromotions,
viewActiveNonRootPeers = numberOfActiveNonRootPeers,
viewActiveNonRootPeersDemotions = numberOfActiveNonRootPeersDemotions,

viewKnownBootstrapPeers = numberOfKnownBootstrapPeers,
viewColdBootstrapPeersPromotions = numberOfColdBootstrapPeersPromotions,
Expand Down Expand Up @@ -904,15 +906,15 @@ peerSelectionCountersHWC PeerSelectionCounters {..} =
numberOfActiveLocalRootPeers,
numberOfActiveLocalRootPeersDemotions,

numberOfKnownSharedPeers = numberOfKnownSharedPeers
- numberOfEstablishedSharedPeers,
numberOfColdSharedPeersPromotions,
numberOfEstablishedSharedPeers = numberOfEstablishedSharedPeers
- numberOfActiveSharedPeers,
numberOfWarmSharedPeersDemotions,
numberOfWarmSharedPeersPromotions,
numberOfActiveSharedPeers,
numberOfActiveSharedPeersDemotions,
numberOfKnownNonRootPeers = numberOfKnownNonRootPeers
- numberOfEstablishedNonRootPeers,
numberOfColdNonRootPeersPromotions,
numberOfEstablishedNonRootPeers = numberOfEstablishedNonRootPeers
- numberOfActiveNonRootPeers,
numberOfWarmNonRootPeersDemotions,
numberOfWarmNonRootPeersPromotions,
numberOfActiveNonRootPeers,
numberOfActiveNonRootPeersDemotions,

numberOfKnownBootstrapPeers = numberOfKnownBootstrapPeers
- numberOfEstablishedBootstrapPeers,
Expand Down Expand Up @@ -1007,16 +1009,16 @@ peerSelectionStateToView
viewActiveLocalRootPeersDemotions = size $ activeLocalRootsPeersSet
`Set.intersection` inProgressDemoteHot,

viewKnownSharedPeers = size knownSharedPeersSet,
viewColdSharedPeersPromotions = size $ knownSharedPeersSet
viewKnownNonRootPeers = size knownNonRootPeersSet,
viewColdNonRootPeersPromotions = size $ knownNonRootPeersSet
`Set.intersection` inProgressPromoteCold,
viewEstablishedSharedPeers = size establishedSharedPeersSet,
viewWarmSharedPeersDemotions = size $ establishedSharedPeersSet
viewEstablishedNonRootPeers = size establishedNonRootPeersSet,
viewWarmNonRootPeersDemotions = size $ establishedNonRootPeersSet
`Set.intersection` inProgressDemoteWarm,
viewWarmSharedPeersPromotions = size $ establishedSharedPeersSet
viewWarmNonRootPeersPromotions = size $ establishedNonRootPeersSet
`Set.intersection` inProgressPromoteWarm,
viewActiveSharedPeers = size activeSharedPeersSet,
viewActiveSharedPeersDemotions = size $ activeSharedPeersSet
viewActiveNonRootPeers = size activeNonRootPeersSet,
viewActiveNonRootPeersDemotions = size $ activeNonRootPeersSet
`Set.intersection` inProgressDemoteHot
}
where
Expand Down Expand Up @@ -1060,9 +1062,9 @@ peerSelectionStateToView
-- shared peers
-- shared peers are not big ledger peers, hence we can use `knownPeersSet`,
-- `establishedPeersSet` and `activePeersSet` below.
knownSharedPeersSet = knownPeersSet Set.\\ rootPeersSet
establishedSharedPeersSet = establishedPeersSet Set.\\ rootPeersSet
activeSharedPeersSet = activePeersSet Set.\\ rootPeersSet
knownNonRootPeersSet = knownPeersSet Set.\\ rootPeersSet
establishedNonRootPeersSet = establishedPeersSet Set.\\ rootPeersSet
activeNonRootPeersSet = activePeersSet Set.\\ rootPeersSet


peerSelectionStateToCounters
Expand Down Expand Up @@ -1111,13 +1113,13 @@ emptyPeerSelectionCounters =
numberOfActiveLocalRootPeers = 0,
numberOfActiveLocalRootPeersDemotions = 0,

numberOfKnownSharedPeers = 0,
numberOfColdSharedPeersPromotions = 0,
numberOfEstablishedSharedPeers = 0,
numberOfWarmSharedPeersDemotions = 0,
numberOfWarmSharedPeersPromotions = 0,
numberOfActiveSharedPeers = 0,
numberOfActiveSharedPeersDemotions = 0
numberOfKnownNonRootPeers = 0,
numberOfColdNonRootPeersPromotions = 0,
numberOfEstablishedNonRootPeers = 0,
numberOfWarmNonRootPeersDemotions = 0,
numberOfWarmNonRootPeersPromotions = 0,
numberOfActiveNonRootPeers = 0,
numberOfActiveNonRootPeersDemotions = 0
}

emptyPeerSelectionState :: StdGen
Expand Down

0 comments on commit 43cbe72

Please sign in to comment.