Remove two related TODOs. Storage nodes keep their UUIDs in recovery stage and

no conflict can happen (known by address but not UUID), because the recovery is
done at startup an no storage nodes are known by address.


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

neo/master/app.py

@@ -751,10 +751,6 @@ class Application(object):
                     sys.exit("Cluster has been asked to shut down")
 
     def identifyStorageNode(self, uuid, node):
-        # TODO: check all cases here, when server address change...
-        # in verification and running states, if the node is unknown but the
-        # uuid is not None, we have to give it a new uuid, but in recovery
-        # the node must keep it's UUID
         state = protocol.RUNNING_STATE
         handler = None
         if self.cluster_state == protocol.RECOVERING:
@@ -776,7 +772,7 @@ class Application(object):
                 state = protocol.PENDING_STATE
             handler = storage.StorageServiceHandler
         elif self.cluster_state == protocol.STOPPING:
-            # FIXME: raise a ShutdowningError ?
+            # FIXME: raise a ShuttingDownError ?
             raise protocol.NotReadyError
         else:
             raise RuntimeError('unhandled cluster state')

neo/master/handlers/identification.py

@@ -53,9 +53,6 @@ class IdentificationHandler(MasterHandler):
             if node.getState() == protocol.RUNNING_STATE:
                 # still running, reject this new node
                 raise protocol.ProtocolError('invalid server address')
-            # FIXME: here the node was known with a different uuid but with the
-            # same address, is it safe to forgot the old, even if he's not
-            # running ?
             node.setServer(address)
             node.setState(protocol.RUNNING_STATE)