Merge branch 'dht_failure_pruning'

CHANGELOG.md

@@ -21,8 +21,8 @@ at anytime.
   *
 
 ### Changed
-  *
+  * keep track of failures for DHT peers for up to ten minutes instead of indefinitely
-  *
+  * skip ignored peers from iterative lookups instead of blocking the peer who returned them to us too
 
 ### Added
   *

lbrynet/dht/constants.py

@@ -29,6 +29,8 @@ rpcTimeout = 5
 
 # number of rpc attempts to make before a timeout results in the node being removed as a contact
 rpcAttempts = 5
+# time window to count failures (in seconds)
+rpcAttemptsPruningTimeWindow = 600
 
 # Delay between iterations of iterative node lookups (for loose parallelism)  (in seconds)
 iterativeLookupDelay = rpcTimeout / 2

lbrynet/dht/contact.py

@@ -185,5 +185,12 @@ class ContactManager(object):
         return contact
 
     def is_ignored(self, origin_tuple):
-        failed_rpc_count = len(self._rpc_failures.get(origin_tuple, []))
+        failed_rpc_count = len(self._prune_failures(origin_tuple))
         return failed_rpc_count > constants.rpcAttempts
+
+    def _prune_failures(self, origin_tuple):
+        # Prunes recorded failures to the last time window of attempts
+        pruning_limit = self._get_time() - constants.rpcAttemptsPruningTimeWindow
+        pruned = list(filter(lambda t: t >= pruning_limit, self._rpc_failures.get(origin_tuple, [])))
+        self._rpc_failures[origin_tuple] = pruned
+        return pruned

lbrynet/dht/iterativefind.py

@@ -110,7 +110,7 @@ class _IterativeFind(object):
                 if (contactTriple[1], contactTriple[2]) in ((c.address, c.port) for c in self.already_contacted):
                     continue
                 elif self.node.contact_manager.is_ignored((contactTriple[1], contactTriple[2])):
-                    raise ValueError("contact is ignored")
+                    continue
                 else:
                     found_contact = self.node.contact_manager.make_contact(contactTriple[0], contactTriple[1],
                                                                            contactTriple[2], self.node._protocol)