Skip to content

Fix startup session races and active-pool re-admission #39

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

Merged
pk910 merged 2 commits into from
Jul 29, 2026
Merged

Fix startup session races and active-pool re-admission #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed6d31a
Fix startup session/pool bugs: set node on initiator sessions, lock L…
MysticRyuujin Jul 16, 2026
e10a691
Re-admit demoted nodes to the active pool on traffic
MysticRyuujin Jul 16, 2026
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
3 changes: 3 additions & 0 deletions bootnode/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,12 +1046,15 @@ func (s *Service) onNodeSeen(n *v5node.Node, timestamp time.Time) {
// Look up the generic node from the table
if genericNode := s.elTable.Get(nodeID); genericNode != nil {
genericNode.SetLastSeen(timestamp) // This marks it dirty
// Get falls back to the DB, so Add re-admits demoted nodes
s.elTable.Add(genericNode)
s.elNodeDB.QueueUpdate(genericNode)
}
} else if s.enrManager.FilterCLNode(n.Record()) && s.clTable != nil && s.clNodeDB != nil {
// Look up the generic node from the table
if genericNode := s.clTable.Get(nodeID); genericNode != nil {
genericNode.SetLastSeen(timestamp) // This marks it dirty
s.clTable.Add(genericNode)
s.clNodeDB.QueueUpdate(genericNode)
}
}
Expand Down
4 changes: 4 additions & 0 deletions discv5/protocol/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,10 @@ func (h *Handler) handleWHOAREYOUPacket(packet *Packet, from *net.UDPAddr, local
}
}

if sess.GetNode() == nil && remoteNode != nil {
sess.SetNode(remoteNode)
}

h.config.Sessions.Put(sess)

// Call OnHandshakeComplete callback for outgoing handshake
Expand Down
7 changes: 7 additions & 0 deletions nodes/flattable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,14 @@ func (t *FlatTable) LoadInitialNodesFromDB() error {
// Load random nodes from DB to bootstrap the active pool
randomNodes := t.db.LoadRandomNodes(t.maxActiveNodes)

t.mu.Lock()
defer t.mu.Unlock()

for _, n := range randomNodes {
if _, exists := t.activeNodes[n.ID()]; exists {
continue
}

if t.ipLimiter.CanAdd(n) {
t.activeNodes[n.ID()] = n
t.ipLimiter.Add(n)
Expand Down