LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

Merge pull request #1834 from lbryio/remove-blob-request-lock

Browse source 
remove blob request asyncio.Lock
This commit is contained in:
Jack Robison 2019-01-31 20:46:01 -05:00 committed by GitHub
commit be6e8744b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lbrynet/blob_exchange/client.py
View file

@ -23,7 +23,6 @@ class BlobExchangeClientProtocol(asyncio.Protocol):
self._blob_bytes_received = 0 self._blob_bytes_received = 0
self._response_fut: asyncio.Future = None self._response_fut: asyncio.Future = None
self._request_lock = asyncio.Lock(loop=self.loop)
def data_received(self, data: bytes): def data_received(self, data: bytes):
if not self.transport or self.transport.is_closing(): if not self.transport or self.transport.is_closing():
@ -130,23 +129,22 @@ class BlobExchangeClientProtocol(asyncio.Protocol):
async def download_blob(self, blob: 'BlobFile') -> typing.Tuple[bool, bool]: async def download_blob(self, blob: 'BlobFile') -> typing.Tuple[bool, bool]:
if blob.get_is_verified(): if blob.get_is_verified():
return False, True return False, True
async with self._request_lock: try:
try: self.blob, self.writer, self._blob_bytes_received = blob, blob.open_for_writing(), 0
self.blob, self.writer, self._blob_bytes_received = blob, blob.open_for_writing(), 0 self._response_fut = asyncio.Future(loop=self.loop)
self._response_fut = asyncio.Future(loop=self.loop) return await self._download_blob()
return await self._download_blob() except OSError:
except OSError: log.error("race happened downloading from %s:%i", self.peer_address, self.peer_port)
log.error("race happened downloading from %s:%i", self.peer_address, self.peer_port) # i'm not sure how to fix this race condition - jack
# i'm not sure how to fix this race condition - jack return False, True
return False, True except asyncio.TimeoutError:
except asyncio.TimeoutError: if self._response_fut and not self._response_fut.done():
if self._response_fut and not self._response_fut.done(): self._response_fut.cancel()
self._response_fut.cancel() return False, False
return False, False except asyncio.CancelledError:
except asyncio.CancelledError: if self._response_fut and not self._response_fut.done():
if self._response_fut and not self._response_fut.done(): self._response_fut.cancel()
self._response_fut.cancel() return False, True
return False, True
def connection_made(self, transport: asyncio.Transport): def connection_made(self, transport: asyncio.Transport):
self.transport = transport self.transport = transport