diff --git a/neo/client/app.py b/neo/client/app.py index 635d731f5c2cd0ac4f88a67e4c9dceacea7a8187..50ae35242649aed10eb16696bc7cf702ad3d77f7 100644 --- a/neo/client/app.py +++ b/neo/client/app.py @@ -306,20 +306,6 @@ class Application(object): self._nm_acquire = lock.acquire self._nm_release = lock.release - def notifyDeadNode(self, conn): - """ Notify a storage failure to the primary master """ - s_node = self.nm.getNodeByServer(conn.getAddress()) - if s_node is None or not s_node.isStorage(): - return - s_uuid = s_node.getUUID() - m_conn = self._getMasterConnection() - m_conn.lock() - try: - node_list = [(protocol.STORAGE_NODE_TYPE, s_node.getServer(), s_uuid, s_node.getState())] - m_conn.notify(protocol.notifyNodeInformation(node_list)) - finally: - m_conn.unlock() - def _waitMessage(self, target_conn = None, msg_id = None, handler=None): """Wait for a message returned by the dispatcher in queues.""" local_queue = self.local_var.queue diff --git a/neo/master/handlers/client.py b/neo/master/handlers/client.py index 8f0f027f801fc52ab94c2fb6c8148df05707d2b7..a03067f7e3d3bdec4cf1beb9e5043f790523c09a 100644 --- a/neo/master/handlers/client.py +++ b/neo/master/handlers/client.py @@ -74,20 +74,6 @@ class ClientServiceHandler(BaseServiceHandler): if t.getConnection() is conn: del app.finishing_transaction_dict[tid] - def handleNotifyNodeInformation(self, conn, packet, node_list): - for node_type, addr, uuid, state in node_list: - # XXX: client must notify only about storage failures, so remove - # this assertion when done - assert node_type == protocol.STORAGE_NODE_TYPE - assert state in (protocol.TEMPORARILY_DOWN_STATE, protocol.BROKEN_STATE) - node = self.app.nm.getNodeByUUID(uuid) - assert node is not None - if self.app.em.getConnectionByUUID(uuid) is None: - # trust this notification only if I don't have a connexion to - # this node - node.setState(state) - self.app.broadcastNodeInformation(node) - def handleAbortTransaction(self, conn, packet, tid): try: del self.app.finishing_transaction_dict[tid]