Some changes in election:

- Nodes start in UNKNOWN state.
- Running and Unknown nodes are candidates during election.
- Set temporarily down if an established connection is lost.
- Keep in unknown state if a connection fails.

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

neo/master/app.py

@@ -137,16 +137,11 @@ class Application(object):
         self.negotiating_master_node_set = set()
         self.listening_conn.setHandler(election.ServerElectionHandler(self))
 
-        for node in self.nm.getMasterList():
-            # For now, believe that every node should be available,
-            # since down or broken nodes may be already repaired.
-            node.setRunning()
-
         while True:
 
             # handle new connected masters
             for node in self.nm.getMasterList():
-                if node.isRunning():
+                if node.isRunning() or node.isUnknown():
                     self.unconnected_master_node_set.add(node.getAddress())
 
             # start the election process

neo/master/handlers/election.py

@@ -71,42 +71,47 @@ class ClientElectionHandler(ElectionHandler):
         MasterHandler.packetReceived(self, conn, packet)
 
     def connectionStarted(self, conn):
-        app = self.app
         addr = conn.getAddress()
-        app.unconnected_master_node_set.remove(addr)
-        app.negotiating_master_node_set.add(addr)
+        # connection in progress
+        self.app.unconnected_master_node_set.remove(addr)
+        self.app.negotiating_master_node_set.add(addr)
         MasterHandler.connectionStarted(self, conn)
 
+    def connectionFailed(self, conn):
+        addr = conn.getAddress()
+        node = self.app.nm.getByAddress(addr)
+        # connection never success, node is still in unknown state
+        self.app.negotiating_master_node_set.discard(addr)
+        self.app.unconnected_master_node_set.add(addr)
+        MasterHandler.connectionFailed(self, conn)
+
     def connectionCompleted(self, conn):
+        addr = conn.getAddress()
+        node = self.app.nm.getByAddress(addr)
+        # connection successfull, set it as running
+        node.setRunning()
         conn.ask(Packets.AskPrimary())
-        MasterHandler.connectionCompleted(self, conn)
 
     def connectionClosed(self, conn):
+        addr = conn.getAddress()
+        node = self.app.nm.getByAddress(addr)
+        node.setTemporarilyDown()
+        self.app.negotiating_master_node_set.discard(addr)
         self.connectionFailed(conn)
-        MasterHandler.connectionClosed(self, conn)
 
     def timeoutExpired(self, conn):
-        self.connectionFailed(conn)
-        MasterHandler.timeoutExpired(self, conn)
-
-    def connectionFailed(self, conn):
-        app = self.app
         addr = conn.getAddress()
-        app.negotiating_master_node_set.discard(addr)
-        node = app.nm.getByAddress(addr)
-        if node.isRunning():
-            node.setTemporarilyDown()
-        if node.isTemporarilyDown():
-            app.unconnected_master_node_set.add(addr)
-        MasterHandler.connectionFailed(self, conn)
+        node = self.app.nm.getByAddress(addr)
+        node.setTemporarilyDown()
+        self.app.negotiating_master_node_set.discard(addr)
+        MasterHandler.timeoutExpired(self, conn)
 
     def peerBroken(self, conn):
-        app = self.app
         addr = conn.getAddress()
-        node = app.nm.getByAddress(addr)
+        node = self.app.nm.getByAddress(addr)
         if node is not None:
             node.setDown()
-        app.negotiating_master_node_set.discard(addr)
+        self.app.negotiating_master_node_set.discard(addr)
         MasterHandler.peerBroken(self, conn)
 
     def acceptIdentification(self, conn, packet, node_type,