[Neo-report] r1982 gregory - in /trunk/neo: master/ tests/master/

[nobody at svn.erp5.org]

Author: gregory
Date: Tue Mar 30 13:11:36 2010
New Revision: 1982

Log:
Disable processing of answerLastIDs in verification state.

This packet handler should be dropped but it's break some functional tests,
may be due to a race condition when switching from recovery to verification.

Modified:
    trunk/neo/master/verification.py
    trunk/neo/tests/master/testVerification.py

Modified: trunk/neo/master/verification.py
==============================================================================
--- trunk/neo/master/verification.py [iso-8859-1] (original)
+++ trunk/neo/master/verification.py [iso-8859-1] Tue Mar 30 13:11:36 2010
@@ -183,13 +183,10 @@
         return uuid_set
 
     def answerLastIDs(self, conn, loid, ltid, lptid):
-        app = self.app
-        # If I get a bigger value here, it is dangerous.
-        if (loid is not None and app.loid < loid) or \
-           (ltid is not None and app.tm.getLastTID() < ltid) or \
-           (lptid is not None and app.pt.getID() < lptid):
-            logging.critical('got later information in verification')
-            raise VerificationFailure
+        # FIXME: this packet should not allowed here, the master already
+        # accepted the current partition table end IDs. As there were manually
+        # approved during recovery, there is no need to check them here.
+        pass
 
     def answerUnfinishedTransactions(self, conn, tid_list):
         uuid = conn.getUUID()

Modified: trunk/neo/tests/master/testVerification.py
==============================================================================
--- trunk/neo/tests/master/testVerification.py [iso-8859-1] (original)
+++ trunk/neo/tests/master/testVerification.py [iso-8859-1] Tue Mar 30 13:11:36 2010
@@ -94,7 +94,8 @@
         self.assertEqual(self.app.nm.getByAddress(conn.getAddress()).getState(),
                 NodeStates.TEMPORARILY_DOWN)
 
-    def test_09_answerLastIDs(self):
+    def _test_09_answerLastIDs(self):
+        # XXX: test disabled, should be an unexpected packet
         verification = self.verification
         uuid = self.identifyToMasterNode()
         loid = self.app.loid