Skip to content

perf(p2p): randomize contact selection for RLPx connection initiation #6503

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
azteca1998 wants to merge 1 commit into from
Closed

perf(p2p): randomize contact selection for RLPx connection initiation #6503

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 21 additions & 14 deletions crates/networking/p2p/peer_table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,24 +1055,31 @@ impl PeerTableServer {
}

fn do_get_contact_to_initiate(&mut self) -> Option<Contact> {
// Check both main contacts and replacements in each bucket.
// Replacements may contain fresher peers that haven't been tried yet.
for bucket in &self.buckets {
for (node_id, contact) in bucket.contacts.iter().chain(bucket.replacements.iter()) {
if !self.peers.contains_key(node_id)
&& !self.already_tried_peers.contains(node_id)
// Collect all eligible contacts across all buckets (main + replacements)
// and pick one randomly to avoid sequential bias toward sparse low-numbered
// buckets. Most contacts cluster in high-numbered buckets (253-255) due to
// XOR distance distribution, so sequential traversal would waste attempts
// on the sparse lower buckets before reaching them.
let eligible: Vec<(H256, Contact)> = self
.iter_contacts()
.filter(|(node_id, contact)| {
!self.peers.contains_key(*node_id)
&& !self.already_tried_peers.contains(*node_id)
&& contact.knows_us
&& !contact.unwanted
&& contact.is_fork_id_valid != Some(false)
{
self.already_tried_peers.insert(*node_id);
return Some(contact.clone());
}
}
})
.map(|(id, c)| (*id, c.clone()))
.collect();

if let Some((node_id, contact)) = eligible.choose(&mut rand::rngs::OsRng).cloned() {
self.already_tried_peers.insert(node_id);
Some(contact)
} else {
tracing::trace!("Resetting list of tried peers.");
self.already_tried_peers.clear();
None
}
tracing::trace!("Resetting list of tried peers.");
self.already_tried_peers.clear();
None
}

fn do_get_contact_for_lookup(&self, protocol: DiscoveryProtocol) -> Option<Contact> {
Expand Down
Loading