Skip to content

Commit 03fe6b1

Browse files
crocodile-dentistcrocodile-dentist
committed
integrate o-n 0.22.3
1 parent 6cbfab9 commit 03fe6b1

File tree

10 files changed

+421
-379
lines changed

10 files changed

+421
-379
lines changed

‎cardano-node/src/Cardano/Node/Run.hs‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ import Ouroboros.Consensus.Storage.LedgerDB.V2.Args
8383
import Ouroboros.Consensus.Util.Args
8484
import Ouroboros.Consensus.Util.Orphans ()
8585

86+
import Cardano.Network.ConsensusMode
8687
import qualified Cardano.Network.Diffusion as Cardano.Diffusion
8788
import qualified Cardano.Network.Diffusion.Configuration as Configuration
8889
import Cardano.Network.PeerSelection.Bootstrap (UseBootstrapPeers (..))
@@ -426,7 +427,7 @@ handleSimpleNode blockType runP tracers nc onKernel = do
426427
$ Proxy @blk
427428
))
428429

429-
withShutdownHandling (ncShutdownConfig nc) (shutdownTracer tracers) $
430+
withShutdownHandling (ncShutdownConfig nc) (shutdownTracer tracers) $ do
430431
traceWith (startupTracer tracers)
431432
(StartupP2PInfo (ncDiffusionMode nc))
432433
nt@TopologyP2P.RealNodeTopology
@@ -494,6 +495,7 @@ handleSimpleNode blockType runP tracers nc onKernel = do
494495
ledgerPeerSnapshotPathVar
495496
void $ updateLedgerPeerSnapshot
496497
(startupTracer tracers)
498+
nc
497499
(readTVar ledgerPeerSnapshotPathVar)
498500
(readTVar useLedgerVar)
499501
(writeTVar ledgerPeerSnapshotVar)
@@ -555,22 +557,17 @@ handleSimpleNode blockType runP tracers nc onKernel = do
555557
, srnEnableInDevelopmentVersions = ncExperimentalProtocolsEnabled nc
556558
, srnTraceChainDB = chainDBTracer tracers
557559
, srnMaybeMempoolCapacityOverride = ncMaybeMempoolCapacityOverride nc
558-
, srnChainSyncTimeout = customizeChainSyncTimeout
560+
, srnChainSyncIdleTimeout = customizeChainSyncTimeout
559561
, srnSnapshotPolicyArgs = snapshotPolicyArgs
560562
, srnQueryBatchSize = queryBatchSize
561563
, srnLdbFlavorArgs = selectorToArgs ldbBackend
562564
}
563565
where
564-
customizeChainSyncTimeout :: Maybe (IO ChainSyncTimeout)
566+
customizeChainSyncTimeout :: ChainSyncIdleTimeout
565567
customizeChainSyncTimeout = case ncChainSyncIdleTimeout nc of
566-
NoTimeoutOverride -> Nothing
567-
TimeoutOverride t -> Just $ do
568-
cst <- Configuration.defaultChainSyncTimeout
569-
pure $ case t of
570-
0 ->
571-
cst { idleTimeout = Nothing }
572-
_ ->
573-
cst { idleTimeout = Just t }
568+
NoTimeoutOverride -> Configuration.defaultChainSyncIdleTimeout
569+
TimeoutOverride t | t == 0 -> ChainSyncNoIdleTimeout
570+
| otherwise -> ChainSyncIdleTimeout t
574571

575572
logStartupWarnings :: IO ()
576573
logStartupWarnings = do

‎cardano-node/src/Cardano/Node/Tracing/API.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module Cardano.Node.Tracing.API
1010

1111
import Cardano.Logging hiding (traceWith)
1212
import Cardano.Logging.Prometheus.TCPServer (runPrometheusSimple)
13-
import Cardano.Node.Configuration.NodeAddress (File (..), PortNumber)
13+
import Cardano.Node.Configuration.NodeAddress (PortNumber)
1414
import Cardano.Node.Configuration.POM (NodeConfiguration (..))
1515
import Cardano.Node.Protocol.Types
1616
import Cardano.Node.Queries
@@ -109,7 +109,7 @@ initTraceDispatcher nc p networkMagic nodeKernel noBlockForging = do
109109
:: TraceConfig
110110
-> IO ( IO ()
111111
, IO (Maybe String)
112-
, Tracers RemoteAddress LocalAddress blk p2p Cardano.ExtraState Cardano.DebugPeerSelectionState PeerTrustable (Cardano.PublicRootPeers.ExtraPeers RemoteAddress) (Cardano.ExtraPeerSelectionSetsWithSizes RemoteAddress) IO
112+
, Tracers RemoteAddress LocalAddress blk IO
113113
)
114114
mkTracers trConfig = do
115115
ekgStore <- EKG.newStore
@@ -127,7 +127,7 @@ initTraceDispatcher nc p networkMagic nodeKernel noBlockForging = do
127127
then do
128128
-- TODO: check if this is the correct way to use withIOManager
129129
(forwardSink, dpStore, kickoffForwarder) <- withIOManager $ \iomgr -> do
130-
let tracerSocketMode :: Maybe (Net.HowToConnect, ForwarderMode)
130+
let tracerSocketMode :: Maybe (HowToConnect, ForwarderMode)
131131
tracerSocketMode = ncTraceForwardSocket nc
132132

133133
forwardingConf :: TraceOptionForwarder

‎cardano-node/src/Cardano/Node/Tracing/Consistency.hs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,21 @@ getAllNamespaces =
265265
dtMuxNS = map (nsGetTuple . nsReplacePrefix ["Net", "Mux", "Remote"])
266266
(allNamespaces :: [Namespace
267267
(Mux.WithBearer (ConnectionId RemoteAddress) Mux.Trace)])
268+
dtMuxBearerNS = map (nsGetTuple . nsReplacePrefix ["Net", "Mux", "Remote", "Bearer"])
269+
(allNamespaces :: [Namespace
270+
(Mux.WithBearer (ConnectionId RemoteAddress) Mux.BearerTrace)])
271+
dtMuxChannelNS = map (nsGetTuple . nsReplacePrefix ["Net", "Mux", "Remote", "Channel"])
272+
(allNamespaces :: [Namespace
273+
(Mux.WithBearer (ConnectionId RemoteAddress) Mux.ChannelTrace)])
268274
dtLocalMuxNS = map (nsGetTuple . nsReplacePrefix ["Net", "Mux", "Local"])
269275
(allNamespaces :: [Namespace
270276
(Mux.WithBearer (ConnectionId LocalAddress) Mux.Trace)])
277+
dtLocalMuxBearerNS = map (nsGetTuple . nsReplacePrefix ["Net", "Mux", "Local", "Bearer"])
278+
(allNamespaces :: [Namespace
279+
(Mux.WithBearer (ConnectionId RemoteAddress) Mux.BearerTrace)])
280+
dtLocalMuxChannelNS = map (nsGetTuple . nsReplacePrefix ["Net", "Mux", "Local", "Channel"])
281+
(allNamespaces :: [Namespace
282+
(Mux.WithBearer (ConnectionId RemoteAddress) Mux.ChannelTrace)])
271283
dtHandshakeNS = map (nsGetTuple . nsReplacePrefix
272284
["Net", "Handshake", "Remote"])
273285
(allNamespaces :: [Namespace
@@ -412,7 +424,11 @@ getAllNamespaces =
412424
<> txSubmission2NS
413425
-- Diffusion
414426
<> dtMuxNS
427+
<> dtMuxBearerNS
428+
<> dtMuxChannelNS
415429
<> dtLocalMuxNS
430+
<> dtLocalMuxBearerNS
431+
<> dtLocalMuxChannelNS
416432
<> dtHandshakeNS
417433
<> dtLocalHandshakeNS
418434
<> dtDiffusionInitializationNS

‎cardano-node/src/Cardano/Node/Tracing/Documentation.hs‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ import Ouroboros.Network.Diffusion.Types (DiffusionTracer)
8282
import Ouroboros.Network.Driver.Simple (TraceSendRecv)
8383
import qualified Ouroboros.Network.InboundGovernor as InboundGovernor
8484
import Ouroboros.Network.KeepAlive (TraceKeepAliveClient (..))
85-
import qualified Ouroboros.Network.NodeToClient as NtC
8685
import Ouroboros.Network.NodeToNode (RemoteAddress)
8786
import qualified Ouroboros.Network.NodeToNode as NtN
8887
import Ouroboros.Network.PeerSelection.Churn (ChurnCounters (..))
@@ -556,21 +555,6 @@ docTracersFirstPhase condConfigFileName = do
556555
dtLocalMuxTrDoc <- documentTracer (dtLocalMuxTr ::
557556
Logging.Trace IO (Mux.WithBearer (ConnectionId LocalAddress) Mux.Trace))
558557

559-
dtHandshakeTr <- mkCardanoTracer
560-
trBase trForward mbTrEKG
561-
["Net", "Handshake", "Remote"]
562-
configureTracers configReflection trConfig [dtHandshakeTr]
563-
dtHandshakeTrDoc <- documentTracer (dtHandshakeTr ::
564-
Logging.Trace IO (NtN.HandshakeTr NtN.RemoteAddress NtN.NodeToNodeVersion))
565-
566-
dtLocalHandshakeTr <- mkCardanoTracer
567-
trBase trForward mbTrEKG
568-
["Net", "Handshake", "Local"]
569-
configureTracers configReflection trConfig [dtLocalHandshakeTr]
570-
dtLocalHandshakeTrDoc <- documentTracer (dtLocalHandshakeTr ::
571-
Logging.Trace IO
572-
(NtC.HandshakeTr LocalAddress NtC.NodeToClientVersion))
573-
574558
dtDiffusionInitializationTr <- mkCardanoTracer
575559
trBase trForward mbTrEKG
576560
["Startup", "DiffusionInit"]
@@ -768,8 +752,6 @@ docTracersFirstPhase condConfigFileName = do
768752
-- Diffusion
769753
<> dtMuxTrDoc
770754
<> dtLocalMuxTrDoc
771-
<> dtHandshakeTrDoc
772-
<> dtLocalHandshakeTrDoc
773755
<> dtDiffusionInitializationTrDoc
774756
<> dtLedgerPeersTrDoc
775757
-- DiffusionTracersExtra P2P

‎cardano-node/src/Cardano/Node/Tracing/Tracers.hs‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -510,20 +510,40 @@ mkDiffusionTracers configReflection trBase trForward mbTrEKG _trDataPoint trConf
510510
["Net", "Mux", "Remote"]
511511
configureTracers configReflection trConfig [dtMuxTr]
512512

513+
!dtChannelTracer <- mkCardanoTracer
514+
trBase trForward mbTrEKG
515+
["Net", "Mux", "Remote", "Channel"]
516+
configureTracers configReflection trConfig [dtChannelTracer]
517+
518+
!dtBearerTracer <- mkCardanoTracer
519+
trBase trForward mbTrEKG
520+
["Net", "Mux", "Remote", "Bearer"]
521+
configureTracers configReflection trConfig [dtBearerTracer]
522+
523+
!dtHandshakeTracer <- mkCardanoTracer
524+
trBase trForward mbTrEKG
525+
["Net", "Handshake", "Remote"]
526+
configureTracers configReflection trConfig [dtHandshakeTracer]
527+
513528
!dtLocalMuxTr <- mkCardanoTracer
514529
trBase trForward mbTrEKG
515530
["Net", "Mux", "Local"]
516531
configureTracers configReflection trConfig [dtLocalMuxTr]
517532

518-
!dtHandshakeTr <- mkCardanoTracer
533+
!dtLocalChannelTracer <- mkCardanoTracer
519534
trBase trForward mbTrEKG
520-
["Net", "Handshake", "Remote"]
521-
configureTracers configReflection trConfig [dtHandshakeTr]
535+
["Net", "Mux", "Local", "Channel"]
536+
configureTracers configReflection trConfig [dtLocalChannelTracer]
537+
538+
!dtLocalBearerTracer <- mkCardanoTracer
539+
trBase trForward mbTrEKG
540+
["Net", "Mux", "Local", "Bearer"]
541+
configureTracers configReflection trConfig [dtLocalBearerTracer]
522542

523-
!dtLocalHandshakeTr <- mkCardanoTracer
543+
!dtLocalHandshakeTracer <- mkCardanoTracer
524544
trBase trForward mbTrEKG
525545
["Net", "Handshake", "Local"]
526-
configureTracers configReflection trConfig [dtLocalHandshakeTr]
546+
configureTracers configReflection trConfig [dtLocalHandshakeTracer]
527547

528548
!dtDiffusionInitializationTr <- mkCardanoTracer
529549
trBase trForward mbTrEKG
@@ -623,12 +643,20 @@ mkDiffusionTracers configReflection trBase trForward mbTrEKG _trDataPoint trConf
623643
pure $ Diffusion.Tracers
624644
{ Diffusion.dtMuxTracer = Tracer $
625645
traceWith dtMuxTr
646+
, Diffusion.dtChannelTracer = Tracer $
647+
traceWith dtChannelTracer
648+
, Diffusion.dtBearerTracer = Tracer $
649+
traceWith dtBearerTracer
650+
, Diffusion.dtHandshakeTracer = Tracer $
651+
traceWith dtHandshakeTracer
626652
, Diffusion.dtLocalMuxTracer = Tracer $
627653
traceWith dtLocalMuxTr
628-
, Diffusion.dtHandshakeTracer = Tracer $
629-
traceWith dtHandshakeTr
654+
, Diffusion.dtLocalChannelTracer = Tracer $
655+
traceWith dtLocalChannelTracer
656+
, Diffusion.dtLocalBearerTracer = Tracer $
657+
traceWith dtLocalBearerTracer
630658
, Diffusion.dtLocalHandshakeTracer = Tracer $
631-
traceWith dtLocalHandshakeTr
659+
traceWith dtLocalHandshakeTracer
632660
, Diffusion.dtDiffusionTracer = Tracer $
633661
traceWith dtDiffusionInitializationTr
634662
, Diffusion.dtTraceLocalRootPeersTracer = Tracer $

0 commit comments

Comments
 (0)