peerdb/tripe-newpeers.in: Don't start duplicate resolver queries.

Resolver queries are indexed by query domain name.  Previously, if we
find another place which wants the same name resolved, we'd overwrite
the existing query with the new one, which causes the old one to be
cancelled (despite it possibly having made progress).

(This also avoids tickling a bug in mLib's handling of aborted queries,
fixed separately.)

diff --git a/peerdb/tripe-newpeers.in b/peerdb/tripe-newpeers.in
index d720584567f9359eb49986759951931074f5502d..aa9ccfcb5e4c91768250289e27adc246476f6f9f 100644 (file)
--- a/peerdb/tripe-newpeers.in
+++ b/peerdb/tripe-newpeers.in
@@ -75,11 +75,12 @@ class BulkResolver (object):
 
   def prepare(me, host):
     """Prime the resolver to resolve the name HOST."""
-    me._resolvers[host] = M.SelResolveByName \
-                          (host,
-                           lambda name, alias, addr:
-                             me._resolved(host, addr[0]),
-                           lambda: me._resolved(host, None))
+    if host not in me._resolvers:
+      me._resolvers[host] = M.SelResolveByName \
+                            (host,
+                             lambda name, alias, addr:
+                               me._resolved(host, addr[0]),
+                             lambda: me._resolved(host, None))
 
   def run(me):
     """Run the background DNS resolver until it's finished."""