Skip to content

A0-1667 Add timeouts to the dialer #791

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
lesniak43 merged 4 commits into from
Dec 9, 2022
Merged

A0-1667 Add timeouts to the dialer #791

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25f634f
done
Dec 6, 2022
ddec245
Merge branch 'main' into A0-1667-tcp-dialer-timeouts
lesniak43 Dec 6, 2022
5e9a3e2
no fun with timorl
Dec 6, 2022
ee89e6a
Merge branch 'main' into A0-1667-tcp-dialer-timeouts
Dec 9, 2022
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
11 changes: 8 additions & 3 deletions finality-aleph/src/validator_network/outgoing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::fmt::{Debug, Display, Error as FmtError, Formatter};

use futures::channel::mpsc;
use log::{debug, info};
use tokio::time::{sleep, Duration};
use tokio::time::{sleep, timeout, Duration};

use crate::validator_network::{
protocols::{
Expand All @@ -15,6 +15,7 @@ enum OutgoingError<PK: PublicKey, A: Data, ND: Dialer<A>> {
Dial(ND::Error),
ProtocolNegotiation(PeerAddressInfo, ProtocolNegotiationError),
Protocol(PeerAddressInfo, ProtocolError<PK>),
TimedOut,
}

impl<PK: PublicKey, A: Data, ND: Dialer<A>> Display for OutgoingError<PK, A, ND> {
Expand All @@ -32,10 +33,13 @@ impl<PK: PublicKey, A: Data, ND: Dialer<A>> Display for OutgoingError<PK, A, ND>
"communication with {} failed, protocol error: {}",
addr, e
),
TimedOut => write!(f, "dial timeout",),
}
}
}

const DIAL_TIMEOUT: Duration = Duration::from_secs(43);

async fn manage_outgoing<SK: SecretKey, D: Data, A: Data, ND: Dialer<A>>(
secret_key: SK,
public_key: SK::PublicKey,
Expand All @@ -45,9 +49,10 @@ async fn manage_outgoing<SK: SecretKey, D: Data, A: Data, ND: Dialer<A>>(
data_for_user: mpsc::UnboundedSender<D>,
) -> Result<(), OutgoingError<SK::PublicKey, A, ND>> {
debug!(target: "validator-network", "Trying to connect to {}.", public_key);
let stream = dialer
.connect(addresses)

let stream = timeout(DIAL_TIMEOUT, dialer.connect(addresses))
.await
.map_err(|_| OutgoingError::TimedOut)?
.map_err(OutgoingError::Dial)?;
let peer_address_info = stream.peer_address_info();
debug!(target: "validator-network", "Performing outgoing protocol negotiation.");
Expand Down