fix(network): give up peer because of handshake timeout

nervosnetwork · Aug 13, 2020 · 339cda1 · 339cda1
1 parent 17edc8f
commit 339cda1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/core/network/src/connection/keeper.rs b/core/network/src/connection/keeper.rs
@@ -4,7 +4,7 @@ use futures::channel::mpsc::UnboundedSender;
 use log::{debug, error};
 use tentacle::{
     context::ServiceContext,
-    error::{DialerErrorKind, ListenErrorKind},
+    error::{DialerErrorKind, HandshakeErrorKind, ListenErrorKind},
     multiaddr::Multiaddr,
     service::{ServiceError, ServiceEvent},
     traits::ServiceHandle,
@@ -97,6 +97,9 @@ impl ConnectionServiceKeeper {
                 let repeated_connection = PeerManagerEvent::RepeatedConnection { ty, sid, addr };
                 return self.report_peer(repeated_connection);
             }
+            HandshakeError(HandshakeErrorKind::Timeout(reason)) => {
+                ConnectionErrorKind::TimeOut(reason)
+            }
             HandshakeError(err) => ConnectionErrorKind::SecioHandshake(Box::new(err)),
             TransportError(err) => ConnectionErrorKind::from(err),
         };

diff --git a/core/network/src/event.rs b/core/network/src/event.rs
@@ -49,6 +49,9 @@ pub enum ConnectionErrorKind {
     #[display(fmt = "handshake {}", _0)]
     SecioHandshake(Box<dyn Error + Send>),
 
+    #[display(fmt = "timeout {}", _0)]
+    TimeOut(String),
+
     #[display(fmt = "remote peer doesn't match one in multiaddr")]
     PeerIdNotMatch,
 

diff --git a/core/network/src/peer_manager/mod.rs b/core/network/src/peer_manager/mod.rs
@@ -894,6 +894,7 @@ impl PeerManager {
     fn connect_failed(&mut self, addr: Multiaddr, error_kind: ConnectionErrorKind) {
         use ConnectionErrorKind::{
             DNSResolver, Io, MultiaddrNotSuppored, PeerIdNotMatch, ProtocolHandle, SecioHandshake,
+            TimeOut,
         };
 
         let peer_addr: PeerMultiaddr = match addr.clone().try_into() {
@@ -925,6 +926,10 @@ impl PeerManager {
                 warn!("give up multiaddr {} because peer id not match", peer_addr);
                 peer.multiaddrs.give_up(&peer_addr);
             }
+            TimeOut(reason) => {
+                info!("connect timeout {}", reason);
+                peer.multiaddrs.inc_failure(&peer_addr);
+            }
             SecioHandshake(_) | ProtocolHandle => {
                 warn!("give up peer {:?} becasue {}", peer.id, error_kind);
                 peer.set_connectedness(Connectedness::Unconnectable);