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

fix redundant blob request to peer

Browse source
This commit is contained in:
Jack Robison 2017-09-15 18:44:51 -04:00
parent ab3c987034
commit ffbcd82263
No known key found for this signature in database
GPG key ID: 284699E7404E3CFF
2 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lbrynet/core/client/BlobRequester.py
View file

@ -226,7 +226,8 @@ class RequestHelper(object):
self.requestor._update_local_score(self.peer, score) self.requestor._update_local_score(self.peer, score)
def _request_failed(self, reason, request_type): def _request_failed(self, reason, request_type):
if reason.check(DownloadCanceledError, RequestCanceledError, ConnectionAborted): if reason.check(DownloadCanceledError, RequestCanceledError, ConnectionAborted,
ConnectionClosedBeforeResponseError):
return return
if reason.check(NoResponseError): if reason.check(NoResponseError):
self.requestor._incompatible_peers.append(self.peer) self.requestor._incompatible_peers.append(self.peer)

16
lbrynet/core/client/ClientProtocol.py
View file

@ -51,19 +51,8 @@ class ClientProtocol(Protocol, TimeoutMixin):
self.setTimeout(None) self.setTimeout(None)
self._rate_limiter.report_dl_bytes(len(data)) self._rate_limiter.report_dl_bytes(len(data))
def in_case_IOError():
#TODO: writes can raise IOError if another peer finished
#writing and closes the other peeer's writers. Fix this
#by preventing peers from downloading the same blobs
msg = "Failed to write, blob is likely closed by another peer finishing download"
log.warn(msg)
self.transport.loseConnection()
if self._downloading_blob is True: if self._downloading_blob is True:
try:
self._blob_download_request.write(data) self._blob_download_request.write(data)
except IOError as e:
in_case_IOError()
else: else:
self._response_buff += data self._response_buff += data
if len(self._response_buff) > conf.settings['MAX_RESPONSE_INFO_SIZE']: if len(self._response_buff) > conf.settings['MAX_RESPONSE_INFO_SIZE']:
@ -75,12 +64,7 @@ class ClientProtocol(Protocol, TimeoutMixin):
self._response_buff = '' self._response_buff = ''
self._handle_response(response) self._handle_response(response)
if self._downloading_blob is True and len(extra_data) != 0: if self._downloading_blob is True and len(extra_data) != 0:
try:
self._blob_download_request.write(extra_data) self._blob_download_request.write(extra_data)
except IOError as e:
in_case_IOError()
def timeoutConnection(self): def timeoutConnection(self):
log.info("Connection timed out to %s", self.peer) log.info("Connection timed out to %s", self.peer)