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

probe peer instead of scheduling ping for removal

Browse source
This commit is contained in:
Victor Shyba 2019-05-13 14:46:06 -03:00
parent 6f79875135
commit 2439743804
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -141,13 +141,10 @@ class IterativeFinder:
def _add_active(self, peer): def _add_active(self, peer):
if peer not in self.active and peer.node_id and peer.node_id != self.protocol.node_id: if peer not in self.active and peer.node_id and peer.node_id != self.protocol.node_id:
if self.peer_manager.peer_is_good(peer) is not False: self.active.add(peer)
self.active.add(peer) if self._is_closer(peer):
if self._is_closer(peer): self.prev_closest_peer = self.closest_peer
self.prev_closest_peer = self.closest_peer self.closest_peer = peer
self.closest_peer = peer
else:
self.protocol.ping_queue.enqueue_maybe_ping(peer, 0.0)
async def _handle_probe_result(self, peer: 'KademliaPeer', response: FindResponse): async def _handle_probe_result(self, peer: 'KademliaPeer', response: FindResponse):
self._add_active(peer) self._add_active(peer)
@ -276,7 +273,10 @@ class IterativeNodeFinder(IterativeFinder):
def put_result(self, from_iter: typing.Iterable['KademliaPeer'], finish=False): def put_result(self, from_iter: typing.Iterable['KademliaPeer'], finish=False):
not_yet_yielded = [ not_yet_yielded = [
peer for peer in from_iter if peer not in self.yielded_peers and peer.node_id != self.protocol.node_id peer for peer in from_iter
if peer not in self.yielded_peers
and peer.node_id != self.protocol.node_id
and self.peer_manager.peer_is_good(peer) is not False
] ]
not_yet_yielded.sort(key=lambda peer: self.distance(peer.node_id)) not_yet_yielded.sort(key=lambda peer: self.distance(peer.node_id))
to_yield = not_yet_yielded[:min(constants.k, len(not_yet_yielded))] to_yield = not_yet_yielded[:min(constants.k, len(not_yet_yielded))]

3
tests/integration/test_dht.py
View file

@ -111,4 +111,5 @@ class DHTIntegrationTest(AsyncioTestCase):
# now a search happens, which removes bad peers while contacting them # now a search happens, which removes bad peers while contacting them
self.assertTrue(node1.protocol.routing_table.get_peers()) self.assertTrue(node1.protocol.routing_table.get_peers())
await node1.peer_search(node2.protocol.node_id) await node1.peer_search(node2.protocol.node_id)
self.assertIn(peer, node1.protocol.ping_queue._pending_contacts) await asyncio.sleep(.3) # let pending events settle
self.assertFalse(node1.protocol.routing_table.get_peers())