From d42d6b5305b6617bd5bdc7417500e115e2346a88 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 22 Aug 2014 18:06:20 +0000 Subject: QPID-6035: HA clearly distinguish qpid-ha commands intended for cluster manager. This commit adds a --cluster-manager flag to qpid-ha tool. Without this flag - the 'promote' command is not listed in the tool help. - using the promote command raises an error saying that it is only for cluster manager use and mentioning the --cluster-manager flag. With the flag: promote functions as before. The qpid-ha help text for promote is also more clear now that it is for cluster manager only. Originally the idea was to split qpid-ha into two tools but I have kept one tool with the flag and warning messages because it: - avoids packaging changes that might trip things up. - helps people who are already using qpid-ha promote: their scripts will break but the error message explains how to fix it. I think the special role of promote is sufficiently clear now even if it is part of the same tool. This commit also updates the following to take account of the new flag: - rgmanager qpidd-primary script. - qpidd tests. - qpid book HA chapter. NOTE: THIS WILL BREAK TEST HARNESSES that do promotion outside of rgmanager. You'll need to add the --cluster-manager flag in the relevant places. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619877 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/ha_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/tests/ha_test.py b/qpid/cpp/src/tests/ha_test.py index f09a4cd573..9adad45ed4 100755 --- a/qpid/cpp/src/tests/ha_test.py +++ b/qpid/cpp/src/tests/ha_test.py @@ -176,7 +176,7 @@ acl allow all all except Exception, e: raise Exception("Error in qpid_ha -b %s %s: %s"%(url, args,e)) - def promote(self): self.ready(); self.qpid_ha(["promote"]) + def promote(self): self.ready(); self.qpid_ha(["promote", "--cluster-manager"]) def replicate(self, from_broker, queue): self.qpid_ha(["replicate", from_broker, queue]) @property def agent(self): -- cgit v1.2.1