Add the ptid parameter to update() method of PartitionTable class for

consistency.


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

neo/admin/handler.py

@@ -225,7 +225,7 @@ class MasterMonitoringEventHandler(MasterBaseEventHandler):
             # Ignore this packet.
             return
         app.ptid = ptid
-        app.pt.update(cell_list, app.nm)
+        app.pt.update(ptid, cell_list, app.nm)
 
     def handleSendPartitionTable(self, conn, packet, ptid, row_list):
         uuid = conn.getUUID()

neo/client/handlers/master.py

@@ -157,7 +157,7 @@ class PrimaryNotificationsHandler(BaseHandler):
             # Ignore this packet.
             return
         app.ptid = ptid
-        app.pt.update(cell_list, app.nm)
+        app.pt.update(ptid, cell_list, app.nm)
 
     def handleSendPartitionTable(self, conn, packet, ptid, row_list):
         # This handler is in PrimaryBootstrapHandler, since this

neo/pt.py

@@ -164,7 +164,8 @@ class PartitionTable(object):
 
     # XXX: node manager is given here just to verify that any node in the
     # partition table is known, this will be removed when checked.
-    def update(self, cell_list, nm):
+    def update(self, ptid, cell_list, nm):
+        self.id = ptid
         for offset, uuid, state in cell_list:
             node = nm.getNodeByUUID(uuid) 
             if node is None:

neo/storage/handlers/hidden.py

@@ -83,7 +83,7 @@ class HiddenHandler(BaseMasterHandler):
                     app.replicator.addPartition(offset)
 
         # update partition table in memory and the database
-        app.pt.update(cell_list, app.nm)
+        app.pt.update(ptid, cell_list, app.nm)
         app.dm.changePartitionTable(ptid, cell_list)
 
     def handleStartOperation(self, conn, packet):

neo/storage/handlers/master.py

@@ -55,7 +55,7 @@ class MasterOperationHandler(BaseMasterHandler):
                     app.replicator.addPartition(offset)
 
         # update partition table in memory and the database
-        app.pt.update(cell_list, app.nm)
+        app.pt.update(ptid, cell_list, app.nm)
         app.dm.changePartitionTable(ptid, cell_list)
 
     def handleLockInformation(self, conn, packet, tid):

neo/storage/handlers/verification.py

@@ -63,7 +63,7 @@ class VerificationHandler(BaseMasterHandler):
             return
         app.ptid = ptid
         # update partition table in memory and the database
-        app.pt.update(cell_list, app.nm)
+        app.pt.update(ptid, cell_list, app.nm)
         app.dm.changePartitionTable(ptid, cell_list)
 
     def handleStartOperation(self, conn, packet):