forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-24 08:49:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

eth: drop skipped_protected metric and simplify dropper skip path

Browse source 
The skipped_protected metric (added earlier on this branch) counted the
subset of drop skips where inclusion protection was the cause. The
signal can be inferred from rising dropSkipped rate plus the existing
"Protecting high-value peers" debug log, which wasn't worth the second
metric, the causality-check loop over the protected set, and the
baseNotDrop closure extracted solely to share the predicate.

Collapse baseNotDrop back into selectDoNotDrop and remove the metric.
dropSkipped still fires on every skip (fast-path headroom + all-filtered).
This commit is contained in:
Csaba Kiraly 2026-04-13 19:13:12 +02:00
parent a7ce1e2ad8
commit 69a7baefd8
1 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eth/dropper.go
View file

@ -56,10 +56,6 @@ var (
// for any reason (pool has headroom, all candidates trusted/static/young,
// 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
@ -181,27 +177,17 @@ func (cm *dropper) dropRandomPeer() bool {
// Compute the set of inclusion-protected peers before filtering.
protected := cm.protectedPeers(peers)
baseNotDrop := func(p *p2p.Peer) bool {
selectDoNotDrop := func(p *p2p.Peer) bool {
return p.Trusted() || p.StaticDialed() ||
p.Lifetime() < mclock.AbsTime(doNotDropBefore) ||
(p.DynDialed() && cm.maxDialPeers-numDialed > peerDropThreshold) ||
(p.Inbound() && cm.maxInboundPeers-numInbound > peerDropThreshold)
}
selectDoNotDrop := func(p *p2p.Peer) bool {
return baseNotDrop(p) || protected[p]
(p.Inbound() && cm.maxInboundPeers-numInbound > peerDropThreshold) ||
protected[p]
}
droppable := slices.DeleteFunc(peers, selectDoNotDrop)
if len(droppable) == 0 {
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
}
p := droppable[mrand.Intn(len(droppable))]