octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(network): only send responded updates on handshake/ping/pong (#3463)

This commit is contained in:
teor 2022-02-09 09:00:58 +10:00 committed by GitHub
parent 752d6b6252
commit 294ea7ebae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
zebra-network/src/peer/handshake.rs
View File

@ -822,6 +822,15 @@ where
let _ = address_book_updater.send(alt_addr).await; let _ = address_book_updater.send(alt_addr).await;
} }
// The handshake succeeded: update the peer status from AttemptPending to Responded
if let Some(book_addr) = connected_addr.get_address_book_addr() {
// the collector doesn't depend on network activity,
// so this await should not hang
let _ = address_book_updater
.send(MetaAddr::new_responded(&book_addr, &remote_services))
.await;
}
// Set the connection's version to the minimum of the received version or our own. // Set the connection's version to the minimum of the received version or our own.
let negotiated_version = let negotiated_version =
std::cmp::min(remote_version, constants::CURRENT_NETWORK_PROTOCOL_VERSION); std::cmp::min(remote_version, constants::CURRENT_NETWORK_PROTOCOL_VERSION);
@ -865,8 +874,13 @@ where
// CORRECTNESS // CORRECTNESS
// //
// Every message and error must update the peer address state via // Ping/Pong messages and every error must update the peer address state via
// the inbound_ts_collector. // the inbound_ts_collector.
//
// The heartbeat task sends regular Ping/Pong messages,
// and it ends the connection if the heartbeat times out.
// So we can just track peer activity based on Ping and Pong.
// (This significantly improves performance, by reducing time system calls.)
let inbound_ts_collector = address_book_updater.clone(); let inbound_ts_collector = address_book_updater.clone();
let inv_collector = inv_collector.clone(); let inv_collector = inv_collector.clone();
let ts_inner_conn_span = connection_span.clone(); let ts_inner_conn_span = connection_span.clone();
@ -889,11 +903,16 @@ where
); );
if let Some(book_addr) = connected_addr.get_address_book_addr() { if let Some(book_addr) = connected_addr.get_address_book_addr() {
// the collector doesn't depend on network activity, if matches!(msg, Message::Ping(_) | Message::Pong(_)) {
// so this await should not hang // the collector doesn't depend on network activity,
let _ = inbound_ts_collector // so this await should not hang
.send(MetaAddr::new_responded(&book_addr, &remote_services)) let _ = inbound_ts_collector
.await; .send(MetaAddr::new_responded(
&book_addr,
&remote_services,
))
.await;
}
} }
} }
Err(err) => { Err(err) => {