Storage node never send notifyNodeInformation packet, so remove related method

handler in recovery and verification handlers since there only storage nodes
connected to the primary master. Move the method from BaseServiceHandler, common
to client and storage node in service state, to the client service handler.


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

neo/master/handlers/__init__.py

@@ -150,59 +150,6 @@ class MasterHandler(EventHandler):
 class BaseServiceHandler(MasterHandler):
     """This class deals with events for a service phase."""
 
-    def handleNotifyNodeInformation(self, conn, packet, node_list):
-        app = self.app
-        for node_type, addr, uuid, state in node_list:
-            if node_type in (protocol.CLIENT_NODE_TYPE, protocol.ADMIN_NODE_TYPE):
-                # No interest.
-                continue
-
-            if uuid is None:
-                # No interest.
-                continue
-
-            if app.uuid == uuid:
-                # This looks like me...
-                if state == protocol.RUNNING_STATE:
-                    # Yes, I know it.
-                    continue
-                else:
-                    # What?! What happened to me?
-                    raise RuntimeError, 'I was told that I am bad'
-
-            node = app.nm.getNodeByUUID(uuid)
-            if node is None:
-                node = app.nm.getNodeByServer(addr)
-                if node is None:
-                    # I really don't know such a node. What is this?
-                    continue
-            else:
-                if node.getServer() != addr:
-                    # This is different from what I know.
-                    continue
-
-            if node.getState() == state:
-                # No change. Don't care.
-                continue
-
-            node.setState(state)
-            # Something wrong happened possibly. Cut the connection to
-            # this node, if any, and notify the information to others.
-            # XXX this can be very slow.
-            # XXX does this need to be closed in all cases ?
-            c = app.em.getConnectionByUUID(uuid)
-            if c is not None:
-                c.close()
-
-            app.broadcastNodeInformation(node)
-            if node.getNodeType() == protocol.STORAGE_NODE_TYPE:
-                if state == protocol.TEMPORARILY_DOWN_STATE:
-                    cell_list = app.pt.outdate()
-                    if len(cell_list) != 0:
-                        ptid = app.pt.setNextID()
-                        app.broadcastPartitionChanges(ptid, cell_list)
-
-
     def handleAskLastIDs(self, conn, packet):
         app = self.app
         conn.answer(protocol.answerLastIDs(app.loid, app.ltid, app.pt.getID()), packet)

neo/master/handlers/client.py

@@ -74,6 +74,58 @@ class ClientServiceHandler(BaseServiceHandler):
             if t.getConnection() is conn:
                 del app.finishing_transaction_dict[tid]
 
+    def handleNotifyNodeInformation(self, conn, packet, node_list):
+        app = self.app
+        for node_type, addr, uuid, state in node_list:
+            if node_type in (protocol.CLIENT_NODE_TYPE, protocol.ADMIN_NODE_TYPE):
+                # No interest.
+                continue
+
+            if uuid is None:
+                # No interest.
+                continue
+
+            if app.uuid == uuid:
+                # This looks like me...
+                if state == protocol.RUNNING_STATE:
+                    # Yes, I know it.
+                    continue
+                else:
+                    # What?! What happened to me?
+                    raise RuntimeError, 'I was told that I am bad'
+
+            node = app.nm.getNodeByUUID(uuid)
+            if node is None:
+                node = app.nm.getNodeByServer(addr)
+                if node is None:
+                    # I really don't know such a node. What is this?
+                    continue
+            else:
+                if node.getServer() != addr:
+                    # This is different from what I know.
+                    continue
+
+            if node.getState() == state:
+                # No change. Don't care.
+                continue
+
+            node.setState(state)
+            # Something wrong happened possibly. Cut the connection to
+            # this node, if any, and notify the information to others.
+            # XXX this can be very slow.
+            # XXX does this need to be closed in all cases ?
+            c = app.em.getConnectionByUUID(uuid)
+            if c is not None:
+                c.close()
+
+            app.broadcastNodeInformation(node)
+            if node.getNodeType() == protocol.STORAGE_NODE_TYPE:
+                if state == protocol.TEMPORARILY_DOWN_STATE:
+                    cell_list = app.pt.outdate()
+                    if len(cell_list) != 0:
+                        ptid = app.pt.setNextID()
+                        app.broadcastPartitionChanges(ptid, cell_list)
+
     def handleAbortTransaction(self, conn, packet, tid):
         try:
             del self.app.finishing_transaction_dict[tid]

neo/master/handlers/recovery.py

@@ -32,54 +32,6 @@ class RecoveryHandler(MasterHandler):
         # ask the last IDs to perform the recovery
         conn.ask(protocol.askLastIDs())
 
-    def handleNotifyNodeInformation(self, conn, packet, node_list):
-        app = self.app
-        for node_type, addr, uuid, state in node_list:
-            if node_type in (CLIENT_NODE_TYPE, ADMIN_NODE_TYPE):
-                # No interest.
-                continue
-            
-            if uuid is None:
-                # No interest.
-                continue
-
-            if app.uuid == uuid:
-                # This looks like me...
-                if state == RUNNING_STATE:
-                    # Yes, I know it.
-                    continue
-                else:
-                    # What?! What happened to me?
-                    raise RuntimeError, 'I was told that I am bad'
-
-            node = app.nm.getNodeByUUID(uuid)
-            if node is None:
-                node = app.nm.getNodeByServer(addr)
-                if node is None:
-                    # I really don't know such a node. What is this?
-                    continue
-            else:
-                if node.getServer() != addr:
-                    # This is different from what I know.
-                    continue
-
-            if node.getState() == state:
-                # No change. Don't care.
-                continue
-
-            if state == RUNNING_STATE:
-                # No problem.
-                continue
-
-            # Something wrong happened possibly. Cut the connection to this node,
-            # if any, and notify the information to others.
-            # XXX this can be very slow.
-            c = app.em.getConnectionByUUID(uuid)
-            if c is not None:
-                c.close()
-            node.setState(state)
-            app.broadcastNodeInformation(node)
-
     def handleAnswerLastIDs(self, conn, packet, loid, ltid, lptid):
         app = self.app
         pt = app.pt

neo/master/handlers/storage.py

@@ -48,6 +48,59 @@ class StorageServiceHandler(BaseServiceHandler):
         # partition must not oudated to allows a cluster restart.
         self.app.outdateAndBroadcastPartition()
 
+    def handleNotifyNodeInformation(self, conn, packet, node_list):
+        app = self.app
+        for node_type, addr, uuid, state in node_list:
+            if node_type in (protocol.CLIENT_NODE_TYPE, protocol.ADMIN_NODE_TYPE):
+                # No interest.
+                continue
+
+            if uuid is None:
+                # No interest.
+                continue
+
+            if app.uuid == uuid:
+                # This looks like me...
+                if state == protocol.RUNNING_STATE:
+                    # Yes, I know it.
+                    continue
+                else:
+                    # What?! What happened to me?
+                    raise RuntimeError, 'I was told that I am bad'
+
+            node = app.nm.getNodeByUUID(uuid)
+            if node is None:
+                node = app.nm.getNodeByServer(addr)
+                if node is None:
+                    # I really don't know such a node. What is this?
+                    continue
+            else:
+                if node.getServer() != addr:
+                    # This is different from what I know.
+                    continue
+
+            if node.getState() == state:
+                # No change. Don't care.
+                continue
+
+            node.setState(state)
+            # Something wrong happened possibly. Cut the connection to
+            # this node, if any, and notify the information to others.
+            # XXX this can be very slow.
+            # XXX does this need to be closed in all cases ?
+            c = app.em.getConnectionByUUID(uuid)
+            if c is not None:
+                c.close()
+
+            app.broadcastNodeInformation(node)
+            if node.getNodeType() == protocol.STORAGE_NODE_TYPE:
+                if state == protocol.TEMPORARILY_DOWN_STATE:
+                    cell_list = app.pt.outdate()
+                    if len(cell_list) != 0:
+                        ptid = app.pt.setNextID()
+                        app.broadcastPartitionChanges(ptid, cell_list)
+
+
     def handleNotifyInformationLocked(self, conn, packet, tid):
         uuid = conn.getUUID()
         app = self.app

neo/master/handlers/verification.py

@@ -32,54 +32,6 @@ class VerificationHandler(MasterHandler):
         if not self.app.pt.operational():
             raise VerificationFailure, 'cannot continue verification'
 
-    def handleNotifyNodeInformation(self, conn, packet, node_list):
-        app = self.app
-        for node_type, addr, uuid, state in node_list:
-            if node_type in (CLIENT_NODE_TYPE, ADMIN_NODE_TYPE):
-                # No interest.
-                continue
-            
-            if uuid is None:
-                # No interest.
-                continue
-
-            if app.uuid == uuid:
-                # This looks like me...
-                if state == RUNNING_STATE:
-                    # Yes, I know it.
-                    continue
-                else:
-                    # What?! What happened to me?
-                    raise RuntimeError, 'I was told that I am bad'
-
-            node = app.nm.getNodeByUUID(uuid)
-            if node is None:
-                node = app.nm.getNodeByServer(addr)
-                if node is None:
-                    # I really don't know such a node. What is this?
-                    continue
-            else:
-                if node.getServer() != addr:
-                    # This is different from what I know.
-                    continue
-
-            if node.getState() == state:
-                # No change. Don't care.
-                continue
-
-            if state == RUNNING_STATE:
-                # No problem.
-                continue
-
-            # Something wrong happened possibly. Cut the connection to this node,
-            # if any, and notify the information to others.
-            # XXX this can be very slow.
-            c = app.em.getConnectionByUUID(uuid)
-            if c is not None:
-                c.close()
-            node.setState(state)
-            app.broadcastNodeInformation(node)
-
     def handleAnswerLastIDs(self, conn, packet, loid, ltid, lptid):
         app = self.app
         # If I get a bigger value here, it is dangerous.