From 67ecb7f0c6bc8a12373a01f80ade9db8adf7cfb2 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 17 Jul 2012 21:23:12 +0000 Subject: QPID-4145: HA Minor fixes to recovery - Demote timed-out backups from ready to catch-up. - Don't cancel connected backups on timeout, only disconnected ones. - Don't allow promotion of a catch-up broker. - Minor logging improvement. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1362658 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/ha_tests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/src/tests') diff --git a/qpid/cpp/src/tests/ha_tests.py b/qpid/cpp/src/tests/ha_tests.py index 0c4fd4dcc8..3f257eb801 100755 --- a/qpid/cpp/src/tests/ha_tests.py +++ b/qpid/cpp/src/tests/ha_tests.py @@ -211,7 +211,7 @@ class HaCluster(object): if promote_next: self[(i+1) % len(self)].promote() def restart(self, i): - """Start a broker with the same name and data directory. It will get + """Start a broker with the same port, name and data directory. It will get a separate log file: foo.n.log""" b = self._brokers[i] self._brokers[i] = HaBroker( @@ -956,7 +956,8 @@ class RecoveryTests(BrokerTest): def test_expected_backup_timeout(self): """Verify that we time-out expected backups and release held queues - after a configured interval + after a configured interval. Verify backup is demoted to catch-up, + but can still rejoin. """ cluster = HaCluster(self, 3, args=["--ha-backup-timeout=0.5"]); cluster[0].wait_status("active") # Primary ready -- cgit v1.2.1