Add a load() on PartitionTable() to remove some logic from handlers, add

docstring and comments.


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

neo/pt.py

@@ -162,9 +162,31 @@ class PartitionTable(object):
                         self.count_dict[node] = self.count_dict.get(node, 0) - 1
                     break
 
-    # 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 load(self, ptid, row_list, nm):
+        """ 
+        Load the partition table with the specified PTID, discard all previous
+        content and can be done in multiple calls
+        """
+        if ptid != self.id:
+            self.id = ptid
+            self.clear()
+        for offset, row in row_list:
+            for uuid, state in row:
+                node = nm.getNodeByUUID(uuid) 
+                # XXX: the node should be known before we receive the partition
+                # table, so remove this assert when this is checked.
+                assert node is not None
+                self.setCell(offset, node, state)
+
     def update(self, ptid, cell_list, nm):
+        """
+        Update the partition with the cell list supplied. Ignore those changes
+        if the partition table ID is not greater than the current one. If a node
+        is not known, it is created in the node manager and set as unavailable
+        """
+        if ptid <= self.id:
+            logging.warning('ignoring older partition changes')
+            return
         self.id = ptid
         for offset, uuid, state in cell_list:
             node = nm.getNodeByUUID(uuid) 

neo/storage/handlers/hidden.py

@@ -66,6 +66,7 @@ class HiddenHandler(BaseMasterHandler):
     def handleNotifyPartitionChanges(self, conn, packet, ptid, cell_list):
         """This is very similar to Send Partition Table, except that
         the information is only about changes from the previous."""
+        # XXX: this is a copy/paste from handlers/master.py
         app = self.app
         if app.ptid >= ptid:
             # Ignore this packet.

neo/storage/handlers/initialization.py

@@ -36,23 +36,7 @@ class InitializationHandler(BaseMasterHandler):
     def handleSendPartitionTable(self, conn, packet, ptid, row_list):
         """A primary master node sends this packet to synchronize a partition
         table. Note that the message can be split into multiple packets."""
-        app = self.app
-        nm = app.nm
-        pt = app.pt
-        if app.ptid != ptid:
-            app.ptid = ptid
-            pt.clear()
-
-        for offset, row in row_list:
-            for uuid, state in row:
-                node = nm.getNodeByUUID(uuid)
-                if node is None:
-                    node = StorageNode(uuid = uuid)
-                    if uuid != app.uuid:
-                        node.setState(TEMPORARILY_DOWN_STATE)
-                    nm.add(node)
-
-                pt.setCell(offset, node, state)
+        self.app.pt.load(ptid, row_list, self.app.nm)
 
     def handleAnswerPartitionTable(self, conn, packet, ptid, row_list):
         app = self.app