diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-09-10 12:39:44 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-09-10 12:39:44 +0000 |
| commit | f9af7bf906388ffb94a674ddeacb2f206dd5c69c (patch) | |
| tree | ced6e2e54af4ac9781ebf2efbb9b56e2145d8d30 /java/bdbstore | |
| parent | d04cf221fb87a781600a9684c9e6b9eb9a7c6752 (diff) | |
| download | qpid-python-f9af7bf906388ffb94a674ddeacb2f206dd5c69c.tar.gz | |
QPID-4289: Fix 0-8/0-9/0-9-1 failover issues
Applied patch from Philip Harvey <phil@philharveyonline.com> and Oleksandr Rudyy <orudyy@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1382799 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/bdbstore')
2 files changed, 6 insertions, 2 deletions
diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java b/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java index c6a9ba8f8b..0e1ef7b25d 100644 --- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java +++ b/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java @@ -31,6 +31,7 @@ import org.apache.qpid.client.AMQConnection; import org.apache.qpid.jms.ConnectionListener; import org.apache.qpid.jms.ConnectionURL; import org.apache.qpid.test.utils.QpidBrokerTestCase; +import org.apache.qpid.test.utils.TestUtils; import com.sleepycat.je.rep.ReplicationConfig; @@ -134,7 +135,10 @@ public class HAClusterBlackboxTest extends QpidBrokerTestCase public void assertFailoverOccurs(long delay) throws InterruptedException { - _failoverLatch.await(delay, TimeUnit.MILLISECONDS); + if (!_failoverLatch.await(delay, TimeUnit.MILLISECONDS)) + { + LOGGER.warn("Test thread dump:\n\n" + TestUtils.dumpThreads() + "\n"); + } assertEquals("Failover did not occur", 0, _failoverLatch.getCount()); } diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java b/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java index abe13edc32..014b93a1ba 100644 --- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java +++ b/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java @@ -204,7 +204,7 @@ public class HATestClusterCreator public void stopNode(final int brokerPortNumber) { - _testcase.stopBroker(brokerPortNumber); + _testcase.killBroker(brokerPortNumber); } public void stopCluster() throws Exception |