forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-07 07:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

eth: split dropper skip metric into total and protection-caused

Browse source 
Rename eth/dropper/protected to eth/dropper/skipped and mark it on
every skip (fast-path headroom, all candidates un-droppable, or
protection emptied the list). Add eth/dropper/skipped_protected to
count the subset of skips where at least one otherwise-droppable
peer was kept only because of inclusion protection.

The pair lets operators see both the total churn-miss rate and how
often peer protection specifically is the cause.
This commit is contained in:
Csaba Kiraly 2026-04-13 10:01:54 +02:00
parent ed3d5ab3da
commit 832f206275
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
eth/dropper.go
View file

@ -52,9 +52,14 @@ var (
droppedInbound = metrics.NewRegisteredMeter("eth/dropper/inbound", nil) droppedInbound = metrics.NewRegisteredMeter("eth/dropper/inbound", nil)
// droppedOutbound is the number of outbound peers dropped // droppedOutbound is the number of outbound peers dropped
droppedOutbound = metrics.NewRegisteredMeter("eth/dropper/outbound", nil) droppedOutbound = metrics.NewRegisteredMeter("eth/dropper/outbound", nil)
// dropSkipped counts times a drop was skipped because all // dropSkipped counts times a drop was attempted but no peer was dropped,
// droppable candidates were protected by inclusion stats. // for any reason (pool has headroom, all candidates trusted/static/young,
dropSkipped = metrics.NewRegisteredMeter("eth/dropper/protected", nil) // or protected by inclusion stats).
dropSkipped = metrics.NewRegisteredMeter("eth/dropper/skipped", nil)
// dropSkippedProtected counts the subset of skips caused specifically by
// inclusion-based peer protection: at least one otherwise-droppable peer
// was kept only because it was in the protected set.
dropSkippedProtected = metrics.NewRegisteredMeter("eth/dropper/skipped_protected", nil)
) )
// PeerInclusionStats holds the per-peer inclusion data needed by the dropper // PeerInclusionStats holds the per-peer inclusion data needed by the dropper
@ -169,24 +174,33 @@ func (cm *dropper) dropRandomPeer() bool {
// inclusion protection. // inclusion protection.
if cm.maxDialPeers-numDialed > peerDropThreshold && if cm.maxDialPeers-numDialed > peerDropThreshold &&
cm.maxInboundPeers-numInbound > peerDropThreshold { cm.maxInboundPeers-numInbound > peerDropThreshold {
dropSkipped.Mark(1)
return false return false
} }
// Compute the set of inclusion-protected peers before filtering. // Compute the set of inclusion-protected peers before filtering.
protected := cm.protectedPeers(peers) protected := cm.protectedPeers(peers)
selectDoNotDrop := func(p *p2p.Peer) bool { baseNotDrop := func(p *p2p.Peer) bool {
return p.Trusted() || p.StaticDialed() || return p.Trusted() || p.StaticDialed() ||
p.Lifetime() < mclock.AbsTime(doNotDropBefore) || p.Lifetime() < mclock.AbsTime(doNotDropBefore) ||
(p.DynDialed() && cm.maxDialPeers-numDialed > peerDropThreshold) || (p.DynDialed() && cm.maxDialPeers-numDialed > peerDropThreshold) ||
(p.Inbound() && cm.maxInboundPeers-numInbound > peerDropThreshold) || (p.Inbound() && cm.maxInboundPeers-numInbound > peerDropThreshold)
protected[p] }
selectDoNotDrop := func(p *p2p.Peer) bool {
return baseNotDrop(p) || protected[p]
} }
droppable := slices.DeleteFunc(peers, selectDoNotDrop) droppable := slices.DeleteFunc(peers, selectDoNotDrop)
if len(droppable) == 0 { if len(droppable) == 0 {
if len(protected) > 0 { dropSkipped.Mark(1)
dropSkipped.Mark(1) // If any protected peer would otherwise have been droppable,
// protection was the cause of the skip.
for p := range protected {
if !baseNotDrop(p) {
dropSkippedProtected.Mark(1)
break
}
} }
return false return false
} }