From 1ac96337681e45c51d3b9e55412067cf2fdb4ec1 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 15 May 2013 21:53:55 +0000 Subject: QPID-4850: HA Sporadic stall in ha_tests.test_failover_send_receive Fixed a deadlock in the test: test was killing a backup broker then waiting to pass a checkpoint: however if the backup was expected by the primary, the primary holds queues till it connects, so we deadlock. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1483107 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/ha_tests.py | 8 +------- 1 file changed, 1 insertion(+), 7 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 3f870ba5b8..8b4ff80dd0 100755 --- a/qpid/cpp/src/tests/ha_tests.py +++ b/qpid/cpp/src/tests/ha_tests.py @@ -972,19 +972,13 @@ class LongTests(HaBrokerTest): brokers.bounce(victim) # Next one is promoted primary = next else: - brokers.kill(victim, promote_next=False, final=False) - dead = victim + brokers.bounce(victim, promote_next=False) # Make sure we are not stalled map(wait_passed, receivers, checkpoint) # Run another checkpoint to ensure things work in this configuration checkpoint = [ r.received+100 for r in receivers ] map(wait_passed, receivers, checkpoint) - - if dead is not None: - brokers.restart(dead) # Restart backup - brokers[dead].ready() - dead = None i += 1 except: traceback.print_exc() -- cgit v1.2.1