The existing code was exiting election loop too early, as there might not have...

The existing code was exiting election loop too early, as there might not have been an identified connection to primary master (ask/answerPrimaryMaster is quicker than ask/answerPrimaryMaster + request/acceptNodeIdentification).
The correct way is to stop waiting for connections to nodes other than primary master, and this can be done in answerPrimaryMaster.


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

neo/master/app.py

@@ -190,9 +190,8 @@ class Application(object):
                                 ClientConnection(em, client_handler, addr = addr,
                                                  connector_handler = self.connector_handler)
                     em.poll(1)
-                    if (len(self.unconnected_master_node_set) == 0 \
-                            and len(self.negotiating_master_node_set) == 0) \
-                       or self.primary is not None:
+                    if len(self.unconnected_master_node_set) == 0 \
+                       and len(self.negotiating_master_node_set) == 0:
                         break
 
                 # Now there are three situations:

neo/master/handlers/election.py

@@ -192,6 +192,13 @@ class ClientElectionHandler(ElectionHandler):
                     # Whatever the situation is, I trust this master.
                     app.primary = False
                     app.primary_master_node = primary_node
+                    # Stop waiting for connections than primary master's to
+                    # complete to exit election phase ASAP.
+                    primary_server = primary_node.getServer()
+                    app.unconnected_master_node_set.intersection_update(
+                        [primary_server])
+                    app.negotiating_master_node_set.intersection_update(
+                        [primary_server])
 
         # Request a node idenfitication.
         conn.ask(protocol.requestNodeIdentification(MASTER_NODE_TYPE,