Only mark master nodes are running before the first election attempt.

Hence, don't add non-running nodes to unconnected_master_node_set before each election attempt.
Preserve negotiating_master_node_set between attemps to reuse possibly pending connections.


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

neo/master/app.py

@@ -147,17 +147,19 @@ class Application(object):
         em = self.em
         nm = self.nm
 
+        for node in nm.getMasterNodeList():
+            # For now, believe that every node should be available,
+            # since down or broken nodes may be already repaired.
+            node.setState(RUNNING_STATE)
+
         while 1:
             t = 0
             self.primary = None
             self.primary_master_node = None
 
             for node in nm.getMasterNodeList():
-                self.unconnected_master_node_set.add(node.getServer())
-                # For now, believe that every node should be available,
-                # since down or broken nodes may be already repaired.
-                node.setState(RUNNING_STATE)
-            self.negotiating_master_node_set.clear()
+                if node.getState() == RUNNING_STATE:
+                    self.unconnected_master_node_set.add(node.getServer())
 
             # Expire temporarily down nodes. For now, assume that a node
             # which is down for 60 seconds is really down, if this is a