Skip to content

Integrate o-network changes for Genesis support / big ledger peer snapshots #5787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
crocodile-dentist wants to merge 3 commits into from
Closed

Integrate o-network changes for Genesis support / big ledger peer snapshots #5787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08551b7
Improve P2P topology error message
crocodile-dentist Jan 18, 2025
8797a16
Delete unsuppported legacy p2p topology configuration file
crocodile-dentist Dec 16, 2024
4720860
Fix sync targets for Genesis
crocodile-dentist Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion cardano-node/src/Cardano/Node/Configuration/TopologyP2P.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,12 @@ readTopologyFile nc tr = do
]
genesisIncompatible
= Text.pack $ "Cardano.Node.Configuration.Topology.readTopologyFile: "
<> "Bootstrap peers are not used in Genesis consensus mode."
<> "Bootstrap peers (field 'bootstrapPeers') are not compatible "
<> "with Genesis syncing mode, reverting to 'DontUseBootstrapPeers'. "
<> "Big ledger peers will be leveraged for decentralized syncing - it "
<> "is recommened to provide an up-to-date big ledger peer snapshot file "
<> "(field 'peerSnapshotFile' in topology configuration) to facilitate "
<> "this process."
handlerBootstrap :: Text
handlerBootstrap = mconcat
[ "You seem to have not configured any trustable peers. "
Expand Down
7 changes: 5 additions & 2 deletions cardano-node/src/Cardano/Node/Run.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,7 @@ mkP2PArguments NodeConfiguration {
, P2P.daMinBigLedgerPeersForTrustedState = ncMinBigLedgerPeersForTrustedState
}
where
deadlineTargets = Configuration.defaultDeadlineTargets {
deadlineTargets = PeerSelectionTargets {
targetNumberOfRootPeers = ncDeadlineTargetOfRootPeers,
targetNumberOfKnownPeers = ncDeadlineTargetOfKnownPeers,
targetNumberOfEstablishedPeers = ncDeadlineTargetOfEstablishedPeers,
Expand All @@ -939,7 +939,10 @@ mkP2PArguments NodeConfiguration {
targetNumberOfEstablishedBigLedgerPeers = ncDeadlineTargetOfEstablishedBigLedgerPeers,
targetNumberOfActiveBigLedgerPeers = ncDeadlineTargetOfActiveBigLedgerPeers
}
syncTargets = Configuration.defaultSyncTargets {
syncTargets = PeerSelectionTargets {
targetNumberOfRootPeers = 0,
targetNumberOfKnownPeers = 0,
targetNumberOfEstablishedPeers = 0,
targetNumberOfActivePeers = ncSyncTargetOfActivePeers,
targetNumberOfKnownBigLedgerPeers = ncSyncTargetOfKnownBigLedgerPeers,
targetNumberOfEstablishedBigLedgerPeers = ncSyncTargetOfEstablishedBigLedgerPeers,
Expand Down
1 change: 0 additions & 1 deletion cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,6 @@ instance HasSeverityAnnotation (TracePeerSelection addr) where
TraceGovernorWakeup {} -> Info
TraceChurnWait {} -> Info
TraceChurnMode {} -> Info
-- TraceVerifyPeerSnapshot {} -> Info

TraceForgetBigLedgerPeers {} -> Info

Expand Down
18 changes: 0 additions & 18 deletions configuration/cardano/mainnet-p2p-toplogy.json
View file
Open in desktop

This file was deleted.

Loading