Prevent stuck vectors in objects._pending

minode/connection.py

@@ -485,6 +485,7 @@ class Connection(ConnectionBase):
                 logging.debug(dest)
                 shared.i2p_unchecked_node_pool.add((dest, 'i2p'))
             shared.vector_advertise_queue.put(obj.vector)
+        shared.objects.check(obj.vector)
 
     def _process_msg_getdata(self, m):
         getdata = message.GetData.from_message(m)

minode/manager.py

@@ -56,6 +56,8 @@ class Manager(threading.Thread):
         outgoing_connections = 0
         for c in shared.connections.copy():
             if not c.is_alive() or c.status == 'disconnected':
+                shared.objects.check(
+                    *(c.vectors_to_get | c.vectors_requested.keys()))
                 with shared.connections_lock:
                     shared.connections.remove(c)
             else:

minode/sql.py

@@ -56,6 +56,11 @@ class Inventory():
             expires, obj_type, version, stream, data, offset,
             tag=tag, vector=vector)
 
+    def check(self, *vectors):
+        with self._lock:
+            for vector in vectors:
+                self._pending.discard(vector)
+
     def cleanup(self):
         if len(self._pending) > 100:
             logging.warning(
@@ -230,7 +235,6 @@ class Inventory():
             return
         with self._lock:
             self._last[vector] = obj
-            self._pending.discard(vector)
 
     def __bool__(self):
         if self._last: