From 746ac978ddad0a2d1a29ea5971f42b23d3aada8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Wisniewski?= <gregory@nexedi.com>
Date: Wed, 24 Jun 2009 07:59:47 +0000
Subject: [PATCH] Admin handler forward setClusterState packet to the primary
master node.
git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@669 71dcc9de-d417-0410-9af5-da40c76e7ee4
---
neo/admin/handler.py | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/neo/admin/handler.py b/neo/admin/handler.py
index fc20049f..5747e12d 100644
--- a/neo/admin/handler.py
+++ b/neo/admin/handler.py
@@ -115,13 +115,26 @@ class AdminEventHandler(BaseEventHandler):
master_conn = self.app.master_conn
p = protocol.setNodeState(uuid, state, modify_partition_table)
master_conn.ask(p)
- self.app.notified = False
+ self.app.notified = False
while not self.app.notified:
self.app.em.poll(1)
node = self.app.nm.getNodeByUUID(uuid)
p = protocol.answerNodeState(node.getUUID(), node.getState())
conn.answer(p, packet)
+ def handleSetClusterState(self, conn, packet, name, state):
+ if name != self.app.name:
+ logging.error('reject an alien cluster')
+ raise protocol.ProtocolError('invalid cluster name')
+ # forward to primary
+ master_conn = self.app.master_conn
+ p = protocol.setClusterState(name, state)
+ master_conn.ask(p)
+ self.app.cluster_state = None
+ while self.app.cluster_state is None:
+ self.app.em.poll(1)
+ conn.answer(protocol.answerClusterState(self.app.cluster_state), packet)
+
def handleAddPendingNodes(self, conn, packet, uuid_list):
uuids = ', '.join([dump(uuid) for uuid in uuid_list])
logging.info('Add nodes %s' % uuids)
@@ -431,6 +444,9 @@ class MonitoringEventHandler(BaseEventHandler):
self.app.notified = True
+ def handleAnswerClusterState(self, conn, packet, state):
+ self.app.cluster_state = state
+
def handleAnswerNewNodes(self, conn, packet, uuid_list):
self.app.uuid_list = uuid_list
self.app.nn_notified = True
--
2.30.9