Clear transaction informations by master notification only.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2112 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/storage/handlers/__init__.py

@@ -21,7 +21,7 @@ from neo.handler import EventHandler
 from neo import protocol
 from neo.util import dump
 from neo.exception import PrimaryFailure, OperationFailure
-from neo.protocol import NodeStates, Packets, Errors
+from neo.protocol import NodeStates, NodeTypes, Packets, Errors
 
 class BaseMasterHandler(EventHandler):
 
@@ -57,6 +57,10 @@ class BaseMasterHandler(EventHandler):
                     self.app.shutdown(erase=erase)
                 elif state == NodeStates.HIDDEN:
                     raise OperationFailure
+            elif node_type == NodeTypes.CLIENT and state != NodeStates.RUNNING:
+                logging.info('Notified of non-running client, abort (%r)',
+                        dump(uuid))
+                self.app.tm.abortFor(uuid)
 
 
 class BaseClientAndStorageOperationHandler(EventHandler):

neo/storage/handlers/client.py

@@ -32,7 +32,6 @@ class ClientOperationHandler(BaseClientAndStorageOperationHandler):
 
     def connectionLost(self, conn, new_state):
         uuid = conn.getUUID()
-        self.app.tm.abortFor(uuid)
         node = self.app.nm.getByUUID(uuid)
         assert node is not None, conn
         self.app.nm.remove(node)

neo/tests/storage/testClientHandler.py

@@ -70,7 +70,6 @@ class StorageClientHandlerTests(NeoTestBase):
         self.app.nm.createClient(uuid=uuid)
         conn = self._getConnection(uuid=uuid)
         self.operation.connectionClosed(conn)
-        self._checkTransactionsAborted(uuid)
 
     def test_18_askTransactionInformation1(self):
         # transaction does not exists