You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2016/05/26 10:31:21 UTC
[2/2] activemq git commit: increase the lease to allow kahadb
recovery, ci intermittent failure
increase the lease to allow kahadb recovery, ci intermittent failure
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/62ab5568
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/62ab5568
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/62ab5568
Branch: refs/heads/master
Commit: 62ab55683f6fcb5942af43b84ebeb0365699dd2a
Parents: 0757cdc
Author: gtully <ga...@gmail.com>
Authored: Thu May 26 11:29:34 2016 +0100
Committer: gtully <ga...@gmail.com>
Committed: Thu May 26 11:30:32 2016 +0100
----------------------------------------------------------------------
.../apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java | 2 +-
.../activemq/broker/ft/kahaDbJdbcLeaseQueueMasterSlaveTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/62ab5568/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java
index 570b5f1..ab1f1fa 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java
@@ -130,7 +130,7 @@ abstract public class QueueMasterSlaveTestSupport extends JmsTopicSendReceiveWit
MessageConsumer qConsumer = session.createConsumer(new ActiveMQQueue("Consumer.A.VirtualTopic.TA1"));
assertNull("No message there yet", qConsumer.receive(1000));
qConsumer.close();
- assertTrue(!master.isSlave());
+ assertTrue("master is indeed the master", !master.isSlave());
master.stop();
assertTrue("slave started", slaveStarted.await(60, TimeUnit.SECONDS));
assertTrue(!slave.get().isSlave());
http://git-wip-us.apache.org/repos/asf/activemq/blob/62ab5568/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/kahaDbJdbcLeaseQueueMasterSlaveTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/kahaDbJdbcLeaseQueueMasterSlaveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/kahaDbJdbcLeaseQueueMasterSlaveTest.java
index c14506f..89f6f5c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/kahaDbJdbcLeaseQueueMasterSlaveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/kahaDbJdbcLeaseQueueMasterSlaveTest.java
@@ -112,8 +112,8 @@ public class kahaDbJdbcLeaseQueueMasterSlaveTest extends QueueMasterSlaveTestSup
}
protected void configureLocker(KahaDBPersistenceAdapter kahaDBPersistenceAdapter) throws IOException {
- kahaDBPersistenceAdapter.setLockKeepAlivePeriod(500);
- kahaDBPersistenceAdapter.getLocker().setLockAcquireSleepInterval(500);
+ kahaDBPersistenceAdapter.setLockKeepAlivePeriod(2000);
+ kahaDBPersistenceAdapter.getLocker().setLockAcquireSleepInterval(5000);
}
protected DataSource getExistingDataSource() throws Exception {