From f99aacd9dcfd5ebda03a28945c5e89a28b53d78b Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Fri, 4 Oct 2019 09:45:28 -0400 Subject: [PATCH] improve store_to_peer retry, reduce error verbosity --- lbry/lbry/dht/protocol/protocol.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lbry/lbry/dht/protocol/protocol.py b/lbry/lbry/dht/protocol/protocol.py index 8f452bbfa..809ebd0e1 100644 --- a/lbry/lbry/dht/protocol/protocol.py +++ b/lbry/lbry/dht/protocol/protocol.py @@ -532,7 +532,7 @@ class KademliaProtocol(DatagramProtocol): elif error_datagram.response not in old_protocol_errors: log.warning(error_msg) else: - log.warning("known dht protocol backwards compatibility error with %s:%i (lbrynet v%s)", + log.debug("known dht protocol backwards compatibility error with %s:%i (lbrynet v%s)", peer.address, peer.udp_port, old_protocol_errors[error_datagram.response]) df.set_exception(remote_exception) return @@ -542,7 +542,7 @@ class KademliaProtocol(DatagramProtocol): f"pending request: {str(remote_exception)}" log.warning(msg) else: - log.warning("known dht protocol backwards compatibility error with %s:%i (lbrynet v%s)", + log.debug("known dht protocol backwards compatibility error with %s:%i (lbrynet v%s)", address[0], address[1], old_protocol_errors[error_datagram.response]) def datagram_received(self, datagram: bytes, address: typing.Tuple[str, int]) -> None: @@ -646,7 +646,8 @@ class KademliaProtocol(DatagramProtocol): return False return True - async def store_to_peer(self, hash_value: bytes, peer: 'KademliaPeer') -> typing.Tuple[bytes, bool]: + async def store_to_peer(self, hash_value: bytes, peer: 'KademliaPeer', + retry: bool = True) -> typing.Tuple[bytes, bool]: async def __store(): res = await self.get_rpc_peer(peer).store(hash_value) if res != b"OK": @@ -658,16 +659,15 @@ class KademliaProtocol(DatagramProtocol): return await __store() except asyncio.TimeoutError: log.debug("Timeout while storing blob_hash %s at %s", binascii.hexlify(hash_value).decode()[:8], peer) + return peer.node_id, False except ValueError as err: log.error("Unexpected response: %s" % err) + return peer.node_id, False except RemoteException as err: - if 'Invalid token' in str(err): - self.peer_manager.clear_token(peer.node_id) - try: - return await __store() - except (ValueError, asyncio.TimeoutError, RemoteException): - return peer.node_id, False - else: + if 'Invalid token' not in str(err): log.exception("Unexpected error while storing blob_hash") - return peer.node_id, False - + return peer.node_id, False + self.peer_manager.clear_token(peer.node_id) + if not retry: + return peer.node_id, False + return await self.store_to_peer(hash_value, peer, retry=False)