make sure to have a connection to the node before changing it state

only send START_OPERATION message is master is in RUNNING state


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

neo/master/administration.py

@@ -20,7 +20,7 @@ import logging
 from neo import protocol
 from neo.master.handler import MasterEventHandler
 from neo.protocol import RUNNING_STATE, TEMPORARILY_DOWN_STATE, DOWN_STATE, \
-        STORAGE_NODE_TYPE, HIDDEN_STATE, PENDING_STATE
+        STORAGE_NODE_TYPE, HIDDEN_STATE, PENDING_STATE, RUNNING
 from neo.util import dump
 
 class AdministrationEventHandler(MasterEventHandler):
@@ -86,18 +86,30 @@ class AdministrationEventHandler(MasterEventHandler):
             p = protocol.noError('node state changed')
             conn.answer(p, packet)
 
-        # forward information to all nodes
+        # Change node state
         if node.getState() != state:
+            # first make sure to have a connection to the node
+            node_conn = None
+            conn_found = False
+            for node_conn in app.em.getConnectionList():
+                if node_conn.getUUID() == node.getUUID():
+                    conn_found = True
+                    break
+            if conn_found is False:
+                # no connection to the node
+                p = protocol.protocolError('no connection to the node')
+                conn.notify(p)
+                return
+
             node.setState(state)
             p = protocol.noError('state changed')
             conn.answer(p, packet)
             app.broadcastNodeInformation(node)
             # If this is a storage node, ask it to start.
-            if node.getNodeType() == STORAGE_NODE_TYPE and state == RUNNING_STATE:
-                for sn_conn in app.em.getConnectionList():
-                    if sn_conn.getUUID() == node.getUUID():
+            if node.getNodeType() == STORAGE_NODE_TYPE and state == RUNNING_STATE  \
+                   and self.app.cluster_state == RUNNING:
                 logging.info("asking sn to start operation")
-                        sn_conn.notify(protocol.startOperation())
+                node_conn.notify(protocol.startOperation())
 
         # modify the partition table if required
         if modify_partition_table and node.getNodeType() == STORAGE_NODE_TYPE: