cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Correct a dial race condition (#2992)

Browse Source 
## Issue Addressed

On a network with few nodes, it is possible that the same node can be found from a subnet discovery and a normal peer discovery at the same time.

The network behaviour loads these peers into events and processes them when it has the chance. It can happen that the same peer can enter the event queue more than once and then attempt to be dialed twice. 

This PR shifts the registration of nodes in the peerdb as being dialed before they enter the NetworkBehaviour queue, preventing multiple attempts of the same peer being entered into the queue and avoiding the race condition.
This commit is contained in:
Age Manning 2022-02-07 23:25:05 +00:00
parent 48b7c8685b
commit 675c7b7e26
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
beacon_node/lighthouse_network/src/behaviour/mod.rs
View File

@ -812,7 +812,11 @@ impl<TSpec: EthSpec> Behaviour<TSpec> {
for peer_id in peers_to_dial { for peer_id in peers_to_dial {
debug!(self.log, "Dialing cached ENR peer"; "peer_id" => %peer_id); debug!(self.log, "Dialing cached ENR peer"; "peer_id" => %peer_id);
// Remove the ENR from the cache to prevent continual re-dialing on disconnects // Remove the ENR from the cache to prevent continual re-dialing on disconnects
self.discovery.remove_cached_enr(&peer_id); self.discovery.remove_cached_enr(&peer_id);
// For any dial event, inform the peer manager
let enr = self.discovery_mut().enr_of_peer(&peer_id);
self.peer_manager.inject_dialing(&peer_id, enr);
self.internal_events self.internal_events
.push_back(InternalBehaviourMessage::DialPeer(peer_id)); .push_back(InternalBehaviourMessage::DialPeer(peer_id));
} }
@ -1096,6 +1100,9 @@ impl<TSpec: EthSpec> NetworkBehaviourEventProcess<DiscoveryEvent> for Behaviour<
let to_dial_peers = self.peer_manager.peers_discovered(results); let to_dial_peers = self.peer_manager.peers_discovered(results);
for peer_id in to_dial_peers { for peer_id in to_dial_peers {
debug!(self.log, "Dialing discovered peer"; "peer_id" => %peer_id); debug!(self.log, "Dialing discovered peer"; "peer_id" => %peer_id);
// For any dial event, inform the peer manager
let enr = self.discovery_mut().enr_of_peer(&peer_id);
self.peer_manager.inject_dialing(&peer_id, enr);
self.internal_events self.internal_events
.push_back(InternalBehaviourMessage::DialPeer(peer_id)); .push_back(InternalBehaviourMessage::DialPeer(peer_id));
} }
@ -1147,9 +1154,6 @@ impl<TSpec: EthSpec> Behaviour<TSpec> {
if let Some(event) = self.internal_events.pop_front() { if let Some(event) = self.internal_events.pop_front() {
match event { match event {
InternalBehaviourMessage::DialPeer(peer_id) => { InternalBehaviourMessage::DialPeer(peer_id) => {
// For any dial event, inform the peer manager
let enr = self.discovery_mut().enr_of_peer(&peer_id);
self.peer_manager.inject_dialing(&peer_id, enr);
// Submit the event // Submit the event
let handler = self.new_handler(); let handler = self.new_handler();
return Poll::Ready(NBAction::Dial { return Poll::Ready(NBAction::Dial {