[Neo-report] r2112 gregory - in /trunk/neo: storage/handlers/ tests/storage/

[nobody at svn.erp5.org]

Author: gregory
Date: Sat May 15 09:54:22 2010
New Revision: 2112

Log:
Clear transaction informations by master notification only.

Modified:
    trunk/neo/storage/handlers/__init__.py
    trunk/neo/storage/handlers/client.py
    trunk/neo/tests/storage/testClientHandler.py

Modified: trunk/neo/storage/handlers/__init__.py
==============================================================================
--- trunk/neo/storage/handlers/__init__.py [iso-8859-1] (original)
+++ trunk/neo/storage/handlers/__init__.py [iso-8859-1] Sat May 15 09:54:22 2010
@@ -21,7 +21,7 @@
 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 @@
                     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):

Modified: trunk/neo/storage/handlers/client.py
==============================================================================
--- trunk/neo/storage/handlers/client.py [iso-8859-1] (original)
+++ trunk/neo/storage/handlers/client.py [iso-8859-1] Sat May 15 09:54:22 2010
@@ -32,7 +32,6 @@
 
     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)

Modified: trunk/neo/tests/storage/testClientHandler.py
==============================================================================
--- trunk/neo/tests/storage/testClientHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testClientHandler.py [iso-8859-1] Sat May 15 09:54:22 2010
@@ -70,7 +70,6 @@
         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