Commit 4621d1b8 authored by Julien Muchembled's avatar Julien Muchembled

master: simplify connectionLost code in ClientElectionHandler

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2707 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 0be7e00c
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
import neo.lib import neo.lib
from neo.lib.protocol import NodeTypes, Packets from neo.lib.protocol import NodeTypes, NodeStates, Packets
from neo.lib.protocol import NotReadyError, ProtocolError, \ from neo.lib.protocol import NotReadyError, ProtocolError, \
UnexpectedPacketError UnexpectedPacketError
from neo.lib.protocol import BrokenNodeDisallowedError from neo.lib.protocol import BrokenNodeDisallowedError
...@@ -64,26 +64,12 @@ class ClientElectionHandler(MasterHandler): ...@@ -64,26 +64,12 @@ class ClientElectionHandler(MasterHandler):
conn.ask(Packets.AskPrimary()) conn.ask(Packets.AskPrimary())
MasterHandler.connectionCompleted(self, conn) MasterHandler.connectionCompleted(self, conn)
def _connectionLost(self, conn): def connectionLost(self, conn, new_state):
addr = conn.getAddress() addr = conn.getAddress()
node = self.app.nm.getByAddress(addr) node = self.app.nm.getByAddress(addr)
node.setTemporarilyDown() if new_state != NodeStates.BROKEN or node is not None:
node.setState(new_state)
self.app.negotiating_master_node_set.discard(addr) self.app.negotiating_master_node_set.discard(addr)
MasterHandler.connectionClosed(self, conn)
def connectionClosed(self, conn):
self._connectionLost(conn)
def timeoutExpired(self, conn):
self._connectionLost(conn)
def peerBroken(self, conn):
addr = conn.getAddress()
node = self.app.nm.getByAddress(addr)
if node is not None:
node.setDown()
self.app.negotiating_master_node_set.discard(addr)
MasterHandler.peerBroken(self, conn)
def acceptIdentification(self, conn, node_type, def acceptIdentification(self, conn, node_type,
uuid, num_partitions, num_replicas, your_uuid): uuid, num_partitions, num_replicas, your_uuid):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment