Merge pull request ethereum#1569 from carver/high-latency-discovery

Peer discovery on high-latency connection

Author: carver

p2p/discovery.py

@@ -180,20 +180,22 @@ async def bond(self, node: kademlia.Node) -> bool:
 
         if self.use_v5:
             token = self.send_ping_v5(node, [])
+            log_version = "v5"
         else:
             token = self.send_ping_v4(node)
+            log_version = "v4"
 
         try:
             if self.use_v5:
                 got_pong, _, _ = await self.wait_pong_v5(node, token)
             else:
                 got_pong = await self.wait_pong_v4(node, token)
         except AlreadyWaitingDiscoveryResponse:
-            self.logger.debug("bonding failed, already waiting for pong")
+            self.logger.debug("bonding failed, awaiting %s pong from %s", log_version, node)
             return False
 
         if not got_pong:
-            self.logger.debug("bonding failed, didn't receive pong from %s", node)
+            self.logger.debug("bonding failed, didn't receive %s pong from %s", log_version, node)
             self.routing.remove_node(node)
             return False
 
@@ -569,7 +571,7 @@ def process_pong_v4(self, remote: kademlia.Node, token: Hash32) -> None:
         try:
             callback = self.pong_callbacks.get_callback(pingid)
         except KeyError:
-            self.logger.debug('unexpected pong from %s (token == %s)', remote, encode_hex(token))
+            self.logger.debug('unexpected v4 pong from %s (token == %s)', remote, encode_hex(token))
         else:
             callback()
 
@@ -829,7 +831,7 @@ def process_pong_v5(self, remote: kademlia.Node, token: Hash32, raw_msg: bytes,
         try:
             callback = self.pong_callbacks.get_callback(pingid)
         except KeyError:
-            self.logger.debug('unexpected pong from %s (token == %s)', remote, encode_hex(token))
+            self.logger.debug('unexpected v5 pong from %s (token == %s)', remote, encode_hex(token))
         else:
             callback(raw_msg, wait_periods)
 

p2p/kademlia.py

@@ -32,7 +32,7 @@
 k_b = 8  # 8 bits per hop
 
 k_bucket_size = 16
-k_request_timeout = 0.9                  # timeout of message round trips
+k_request_timeout = 7.2                  # timeout of message round trips
 k_idle_bucket_refresh_interval = 3600    # ping all nodes in bucket if bucket was idle
 k_find_concurrency = 3                   # parallel find node lookups
 k_pubkey_size = 512