Skip to content

Ensure disconnecting peers are added to the peerdb #2451

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
merged 1 commit into from
Jul 14, 2021
Merged

Ensure disconnecting peers are added to the peerdb #2451

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions beacon_node/eth2_libp2p/src/peer_manager/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
self.network_globals
.peers
.write()
.notify_disconnecting(&peer_id, true);
.notify_disconnecting(peer_id, true);
return;
}

Expand All @@ -339,7 +339,7 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
self.network_globals
.peers
.write()
.notify_disconnecting(&peer_id, false);
.notify_disconnecting(peer_id, false);
return;
}

Expand Down Expand Up @@ -1023,7 +1023,7 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {

let mut peer_db = self.network_globals.peers.write();
for peer_id in disconnecting_peers {
peer_db.notify_disconnecting(&peer_id, false);
peer_db.notify_disconnecting(peer_id, false);
self.events.push(PeerManagerEvent::DisconnectPeer(
peer_id,
GoodbyeReason::TooManyPeers,
Expand Down
9 changes: 5 additions & 4 deletions beacon_node/eth2_libp2p/src/peer_manager/peerdb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,10 +475,11 @@ impl<TSpec: EthSpec> PeerDB<TSpec> {

/// Notifies the peer manager that the peer is undergoing a normal disconnect. Optionally tag
/// the peer to be banned after the disconnect.
pub fn notify_disconnecting(&mut self, peer_id: &PeerId, to_ban_afterwards: bool) {
if let Some(info) = self.peers.get_mut(peer_id) {
info.disconnecting(to_ban_afterwards);
}
pub fn notify_disconnecting(&mut self, peer_id: PeerId, to_ban_afterwards: bool) {
self.peers
.entry(peer_id)
.or_default()
.disconnecting(to_ban_afterwards);
}

/// Marks a peer to be disconnected and then banned.
Expand Down