Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

refactor so we can stop trapping CancelledError everywhere

Browse source
This commit is contained in:
Victor Shyba 2019-02-22 00:03:40 -03:00 • committed by Jack Robison
parent 7a96e742f2
commit 2d8ebe25ed
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
3 changed files with 13 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lbrynet/blob_exchange/downloader.py
View file

@ -116,22 +116,12 @@ class BlobDownloader:
self.peer_queue.put_nowait(set(batch).difference(self.ignored)) self.peer_queue.put_nowait(set(batch).difference(self.ignored))
else: else:
self.clearbanned() self.clearbanned()
while self.active_connections:
peer, task = self.active_connections.popitem()
if task and not task.done():
task.cancel()
blob.close() blob.close()
log.debug("downloaded %s", blob_hash[:8]) log.debug("downloaded %s", blob_hash[:8])
return blob return blob
except asyncio.CancelledError: finally:
while self.active_connections: while self.active_connections:
peer, task = self.active_connections.popitem() self.active_connections.popitem()[1].cancel()
if task and not task.done():
task.cancel()
raise
except (OSError, Exception) as e:
log.exception(e)
raise e
def close(self): def close(self):
self.scores.clear() self.scores.clear()

10
lbrynet/dht/node.py
View file

@ -190,10 +190,7 @@ class Node:
async def _add_hashes_from_queue(): async def _add_hashes_from_queue():
while True: while True:
try:
blob_hash = await hash_queue.get() blob_hash = await hash_queue.get()
except asyncio.CancelledError:
break
peer_generator.add_generator( peer_generator.add_generator(
self.get_iterative_value_finder( self.get_iterative_value_finder(
binascii.unhexlify(blob_hash.encode()), bottom_out_limit=bottom_out_limit, binascii.unhexlify(blob_hash.encode()), bottom_out_limit=bottom_out_limit,
@ -205,10 +202,6 @@ class Node:
async with peer_generator as junction: async with peer_generator as junction:
yield junction yield junction
await peer_generator.finished.wait() await peer_generator.finished.wait()
except asyncio.CancelledError:
if add_hashes_task and not (add_hashes_task.done() or add_hashes_task.cancelled()):
add_hashes_task.cancel()
raise
finally: finally:
if add_hashes_task and not (add_hashes_task.done() or add_hashes_task.cancelled()): if add_hashes_task and not (add_hashes_task.done() or add_hashes_task.cancelled()):
add_hashes_task.cancel() add_hashes_task.cancel()
@ -236,7 +229,6 @@ class Node:
async def _accumulate_search_junction(self, search_queue: asyncio.Queue, async def _accumulate_search_junction(self, search_queue: asyncio.Queue,
result_queue: asyncio.Queue): result_queue: asyncio.Queue):
try:
async with self.stream_peer_search_junction(search_queue) as search_junction: # pylint: disable=E1701 async with self.stream_peer_search_junction(search_queue) as search_junction: # pylint: disable=E1701
async for peers in search_junction: async for peers in search_junction:
if peers: if peers:
@ -247,8 +239,6 @@ class Node:
and peer.tcp_port == self.protocol.peer_port and peer.tcp_port == self.protocol.peer_port
) )
]) ])
except asyncio.CancelledError:
return
def accumulate_peers(self, search_queue: asyncio.Queue, def accumulate_peers(self, search_queue: asyncio.Queue,
peer_queue: typing.Optional[asyncio.Queue] = None) -> typing.Tuple[ peer_queue: typing.Optional[asyncio.Queue] = None) -> typing.Tuple[

2
lbrynet/dht/protocol/iterative_find.py
View file

@ -162,8 +162,6 @@ class IterativeFinder:
async def _send_probe(self, peer: 'KademliaPeer'): async def _send_probe(self, peer: 'KademliaPeer'):
try: try:
response = await self.send_probe(peer) response = await self.send_probe(peer)
except asyncio.CancelledError:
return
except asyncio.TimeoutError: except asyncio.TimeoutError:
self.active.discard(peer) self.active.discard(peer)
return return