Skip to content

Commit

Permalink
fix(comms): ignore dial cancel event when inbound connection exists (#…
Browse files Browse the repository at this point in the history
…4521)

Description
---
Ignores `DialCancelled` event when the dialer is notified about an established `Inbound` connection

Motivation and Context
---
In the case where A dials B and B dials A and the B->A(Inbound relative to A) connection occurs first. The connectivity manager notifies the dialer actor to cancel any pending dials. However, this emits a DialCancelled event which causes the connectivity manager to discard the previous inbound connection.

This PR ignores canceled dial events when an active inbound connection exists.

Difficult to outright confirm, but I suspect this fixes:
- dial/disconnect churn
- A and B disagreeing on being connected to each other for a time/indefinitely.

How Has This Been Tested?
---
Hard to test for, tested manually by attempting to make B -> A happen first and checking that this case occurs in the logs.
  • Loading branch information
sdbondi authored Aug 24, 2022
1 parent 3f5fcf2 commit a7040c5
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions comms/core/src/connectivity/manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,15 @@ impl ConnectivityManagerActor {
PeerConnected(conn) => (conn.peer_node_id(), ConnectionStatus::Connected, Some(conn.clone())),

PeerConnectFailed(node_id, ConnectionManagerError::DialCancelled) => {
if let Some(conn) = self.pool.get_connection(node_id) {
if conn.is_connected() && conn.direction().is_inbound() {
debug!(
target: LOG_TARGET,
"Ignoring DialCancelled({}) event because an inbound connection already exists", node_id
);
return Ok(());
}
}
debug!(
target: LOG_TARGET,
"Dial was cancelled before connection completed to peer '{}'", node_id
Expand Down

0 comments on commit a7040c5

Please sign in to comment.