Client's storage handler use connectionLost hook.

Storage node register unknown storage node found in the database before loading
the content into the partition table. So an update() can now expect to known the
storage node.


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

neo/client/handlers/storage.py

@@ -36,33 +36,27 @@ class StorageEventHandler(BaseHandler):
                 queue = self.dispatcher.message_table.pop(key)
                 queue_set.add(queue)
         # Storage failure is notified to the primary master when the fake 
-        # packet if popped by a non-polling thread.
+        # packet is popped by a non-polling thread.
         for queue in queue_set:
             queue.put((conn, None))
 
-
-    def connectionClosed(self, conn):
+    def handleConnectionLost(self, conn, new_state):
         node = self.app.nm.getNodeByServer(conn.getAddress())
-        logging.info("connection to storage node %s closed", node.getServer())
         self._dealWithStorageFailure(conn, node)
         super(StorageEventHandler, self).connectionClosed(conn)
 
-    def timeoutExpired(self, conn):
-        node = self.app.nm.getNodeByServer(conn.getAddress())
-        self._dealWithStorageFailure(conn, node)
-        super(StorageEventHandler, self).timeoutExpired(conn)
-
-    def peerBroken(self, conn):
-        node = self.app.nm.getNodeByServer(conn.getAddress())
-        self._dealWithStorageFailure(conn, node)
-        super(StorageEventHandler, self).peerBroken(conn)
-
     def connectionFailed(self, conn):
+        # XXX: a connection failure is not like a connection lost, we should not
+        # have to clear the dispatcher because the connection was never
+        # established and so, no packet should have been send and thus, nothing
+        # must be expected. This should be well done if the first packet sent is
+        # done after the connectionCompleted event or a packet received.
         # Connection to a storage node failed
         node = self.app.nm.getNodeByServer(conn.getAddress())
         self._dealWithStorageFailure(conn, node)
         super(StorageEventHandler, self).connectionFailed(conn)
 
+
 class StorageBootstrapHandler(AnswerBaseHandler):
     """ Handler used when connecting to a storage node """
 

neo/pt.py

@@ -192,13 +192,7 @@ class PartitionTable(object):
         self.id = ptid
         for offset, uuid, state in cell_list:
             node = nm.getNodeByUUID(uuid) 
-            if node is None:
-                logging.warning('Updating partition table with an unknown UUID : %s', 
-                        dump(uuid))
-                from neo.node import StorageNode
-                node = StorageNode(uuid=uuid)
-                node.setState(protocol.TEMPORARILY_DOWN_STATE)
-                nm.add(node)
+            assert node is not None
             self.setCell(offset, node, state)
         logging.debug('partition table updated')
         self.log()

neo/storage/app.py

@@ -113,12 +113,19 @@ class Application(object):
         """Load a partition table from the database."""
         ptid = self.dm.getPTID()
         cell_list = self.dm.getPartitionTable()
-        # dirty, but have to convert states from int to Enum
-        convert_states = lambda (offset, uuid, state): (offset, uuid,
-                protocol.partition_cell_states[state])
-        cell_list = map(convert_states, cell_list)
+        new_cell_list = []
+        for offset, uuid, state in cell_list:
+            # convert from int to Enum
+            state = protocol.partition_cell_states[state]
+            # register unknown nodes
+            if self.nm.getNodeByUUID(uuid) is None:
+                node = StorageNode(uuid=uuid)
+                node.setState(protocol.TEMPORARILY_DOWN_STATE)
+                self.nm.add(node)
+            new_cell_list.append((offset, uuid, state))
+        # load the partition table in manager
         self.pt.clear()
-        self.pt.update(ptid, cell_list, self.nm)
+        self.pt.update(ptid, new_cell_list, self.nm)
 
     def run(self):
         """Make sure that the status is sane and start a loop."""