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

fix iterative find lockup

Browse source
This commit is contained in:
Jack Robison 2018-06-07 11:39:20 -04:00
parent af096aee41
commit b0e4fc4faa
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lbrynet/dht/iterativefind.py
View file

@ -136,8 +136,10 @@ class _IterativeFind(object):
def should_stop(self): def should_stop(self):
if self.prev_closest_node and self.closest_node and self.distance.is_closer(self.prev_closest_node.id, if self.prev_closest_node and self.closest_node and self.distance.is_closer(self.prev_closest_node.id,
self.closest_node.id): self.closest_node.id):
# we're getting further away
return True return True
if len(self.active_contacts) >= constants.k: if len(self.active_contacts) >= constants.k:
# we have enough results
return True return True
return False return False
@ -149,7 +151,7 @@ class _IterativeFind(object):
self.prev_closest_node = self.closest_node self.prev_closest_node = self.closest_node
self.closest_node = self.active_contacts[0] self.closest_node = self.active_contacts[0]
# Sort and store the current shortList length before contacting other nodes # Sort the current shortList before contacting other nodes
self.sortByDistance(self.shortlist) self.sortByDistance(self.shortlist)
probes = [] probes = []
already_contacted_addresses = {(c.address, c.port) for c in self.already_contacted} already_contacted_addresses = {(c.address, c.port) for c in self.already_contacted}
@ -181,13 +183,13 @@ class _IterativeFind(object):
d.addCallback(_remove_probes) d.addCallback(_remove_probes)
elif not self.finished_deferred.called and not self.active_probes: elif not self.finished_deferred.called and not self.active_probes or self.should_stop():
# If no probes were sent, there will not be any improvement, so we're done # If no probes were sent, there will not be any improvement, so we're done
self.sortByDistance(self.active_contacts) self.sortByDistance(self.active_contacts)
self.finished_deferred.callback(self.active_contacts[:min(constants.k, len(self.active_contacts))]) self.finished_deferred.callback(self.active_contacts[:min(constants.k, len(self.active_contacts))])
elif not self.finished_deferred.called and self.should_stop(): elif not self.finished_deferred.called:
self.sortByDistance(self.active_contacts) # Force the next iteration
self.finished_deferred.callback(self.active_contacts[:min(constants.k, len(self.active_contacts))]) self.searchIteration()
def searchIteration(self, delay=constants.iterativeLookupDelay): def searchIteration(self, delay=constants.iterativeLookupDelay):
def _cancel_pending_iterations(result): def _cancel_pending_iterations(result):