[Neo-report] r2302 gregory - /trunk/neo/master/recovery.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Sep 16 14:09:28 CEST 2010
Author: gregory
Date: Thu Sep 16 14:09:26 2010
New Revision: 2302
Log:
Use ZERO_OID/ZERO_TID in recovery.
Modified:
trunk/neo/master/recovery.py
Modified: trunk/neo/master/recovery.py
==============================================================================
--- trunk/neo/master/recovery.py [iso-8859-1] (original)
+++ trunk/neo/master/recovery.py [iso-8859-1] Thu Sep 16 14:09:26 2010
@@ -20,7 +20,7 @@ from struct import pack
from neo import logging
from neo.util import dump
from neo.protocol import Packets, ProtocolError, ClusterStates, NodeStates
-from neo.protocol import NotReadyError
+from neo.protocol import NotReadyError, ZERO_OID, ZERO_TID
from neo.master.handlers import MasterHandler
REQUIRED_NODE_NUMBER = 1
@@ -96,9 +96,9 @@ class RecoveryManager(MasterHandler):
node.setRunning()
self.app.broadcastNodesInformation(node_list)
# resert IDs generators
- self.app.tm.setLastOID('\0' * 8)
+ self.app.tm.setLastOID(ZERO_OID)
# build the partition with this node
- pt.setID(pack('!Q', 1))
+ pt.setID(ZERO_TID)
pt.make(node_list)
def connectionLost(self, conn, new_state):
More information about the Neo-report
mailing list