[Neo-report] r1762 gregory - in /trunk/neo/storage/handlers: __init__.py master.py

[nobody at svn.erp5.org]

Author: gregory
Date: Tue Feb 16 11:04:45 2010
New Revision: 1762

Log:
Handle master's StopOperation packet in any state.

Modified:
    trunk/neo/storage/handlers/__init__.py
    trunk/neo/storage/handlers/master.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] Tue Feb 16 11:04:45 2010
@@ -27,6 +27,9 @@
 
     def connectionLost(self, conn, new_state):
         raise PrimaryFailure('connection lost')
+
+    def stopOperation(self, conn):
+        raise OperationFailure('operation stopped')
 
     def reelectPrimary(self, conn):
         raise PrimaryFailure('re-election occurs')

Modified: trunk/neo/storage/handlers/master.py
==============================================================================
--- trunk/neo/storage/handlers/master.py [iso-8859-1] (original)
+++ trunk/neo/storage/handlers/master.py [iso-8859-1] Tue Feb 16 11:04:45 2010
@@ -24,9 +24,6 @@
 
 class MasterOperationHandler(BaseMasterHandler):
     """ This handler is used for the primary master """
-
-    def stopOperation(self, conn):
-        raise OperationFailure('operation stopped')
 
     def answerLastIDs(self, conn, loid, ltid, lptid):
         self.app.replicator.setCriticalTID(conn.getUUID(), ltid)