From 28fdd629452d400808244bb2a7ae825c6b602ddd Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Tue, 8 Mar 2022 17:25:03 -0300 Subject: [PATCH] move concurreny control to lower layer --- lbry/torrent/tracker.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lbry/torrent/tracker.py b/lbry/torrent/tracker.py index 63709d233..e02659893 100644 --- a/lbry/torrent/tracker.py +++ b/lbry/torrent/tracker.py @@ -64,15 +64,17 @@ class UDPTrackerClientProtocol(asyncio.DatagramProtocol): self.transport = None self.data_queue = {} self.timeout = timeout + self.semaphore = asyncio.Semaphore(10) def connection_made(self, transport: asyncio.DatagramTransport) -> None: self.transport = transport async def request(self, obj, tracker_ip, tracker_port): self.data_queue[obj.transaction_id] = asyncio.get_running_loop().create_future() - self.transport.sendto(encode(obj), (tracker_ip, tracker_port)) try: - return await asyncio.wait_for(self.data_queue[obj.transaction_id], self.timeout) + async with self.semaphore: + self.transport.sendto(encode(obj), (tracker_ip, tracker_port)) + return await asyncio.wait_for(self.data_queue[obj.transaction_id], self.timeout) finally: self.data_queue.pop(obj.transaction_id, None) @@ -129,7 +131,6 @@ class TrackerClient: self.announce_port = announce_port self.servers = servers self.results = {} # we can't probe the server before the interval, so we keep the result here until it expires - self.semaphore = asyncio.Semaphore(10) async def start(self): self.transport, _ = await asyncio.get_running_loop().create_datagram_endpoint( @@ -163,9 +164,8 @@ class TrackerClient: return result try: tracker_ip = await resolve_host(tracker_host, tracker_port, 'udp') - async with self.semaphore: - result = await self.client.announce( - info_hash, self.node_id, self.announce_port, tracker_ip, tracker_port, stopped) + result = await self.client.announce( + info_hash, self.node_id, self.announce_port, tracker_ip, tracker_port, stopped) except asyncio.TimeoutError: log.info("Tracker timed out: %s:%d", tracker_host, tracker_port) return None