fixup! storage: fix possible crash when delaying replication requests

This reverts commit d3c22487 partially
and fixes the bug in a much simpler way.

neo/lib/handler.py

@@ -314,8 +314,7 @@ class _DelayedConnectionEvent(EventHandler):
 
 class EventQueue(object):
 
-    def __init__(self, new_key=lambda prev: None):
-        self._new_key = new_key
+    def __init__(self):
         self._event_queue = []
         self._executing_event = -1
 
@@ -328,12 +327,10 @@ class EventQueue(object):
 
     def queueEvent(self, func, conn=None, args=(), key=None):
         assert self._executing_event < 0, self._executing_event
-        self._event_queue.append((
-            self._new_key(self._event_queue[-1][0] if self._event_queue else
-                          None) if key is None else key,
-            func if conn is None else _DelayedConnectionEvent(
-                func, conn, args)))
-        self.sortQueuedEvents()
+        self._event_queue.append((key, func if conn is None else
+            _DelayedConnectionEvent(func, conn, args)))
+        if key is not None:
+            self.sortQueuedEvents()
 
     def sortAndExecuteQueuedEvents(self):
         if self._executing_event < 0:
@@ -372,7 +369,8 @@ class EventQueue(object):
                 self._executing_event = 0
                 # What sortAndExecuteQueuedEvents could not do immediately
                 # is done here:
-                self.sortQueuedEvents()
+                if event[0] is not None:
+                    self.sortQueuedEvents()
             self._executing_event = -1
 
     def logQueuedEvents(self):

neo/storage/handlers/storage.py

@@ -142,7 +142,7 @@ class StorageOperationHandler(EventHandler):
     #         if client tasks are finished)
 
     def getEventQueue(self):
-        return self.app.tm
+        return self.app.tm.read_queue
 
     @checkFeedingConnection(check=True)
     def askCheckTIDRange(self, conn, *args):

neo/storage/transactions.py

@@ -37,21 +37,7 @@ class NotRegisteredError(Exception):
         Raised when a ttid is not registered
     """
 
-class TransactionManagerEventKey(object):
-
-    def __init__(self, tid):
-        self.locking_tid = tid
-
-    def __lt__(self, other):
-        return self.locking_tid < other.locking_tid
-
-    def __repr__(self):
-        return "<%s(%s) at 0x%x>" % (
-            self.__class__.__name__,
-            dump(self.locking_tid),
-            id(self))
-
-class Transaction(TransactionManagerEventKey):
+class Transaction(object):
     """
         Container for a pending transaction
     """
@@ -61,7 +47,7 @@ class Transaction(TransactionManagerEventKey):
 
     def __init__(self, uuid, ttid):
         self._birth = time()
-        TransactionManagerEventKey.__init__(self, ttid)
+        self.locking_tid = ttid
         self.uuid = uuid
         self.serial_dict = {}
         self.store_dict = {}
@@ -77,6 +63,9 @@ class Transaction(TransactionManagerEventKey):
             time() - self._birth,
             id(self))
 
+    def __lt__(self, other):
+        return self.locking_tid < other.locking_tid
+
     def logDelay(self, ttid, locked, oid_serial):
         if self._delayed.get(oid_serial) != locked:
             if self._delayed:
@@ -99,8 +88,7 @@ class TransactionManager(EventQueue):
     """
 
     def __init__(self, app):
-        EventQueue.__init__(self, lambda prev: TransactionManagerEventKey(
-            "" if prev is None else prev.locking_tid))
+        EventQueue.__init__(self)
         self.read_queue = EventQueue()
         self._app = app
         self._transaction_dict = {}