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 2015/05/20 14:43:30 UTC
[1/8] activemq git commit: reduce test duration for ci
Repository: activemq
Updated Branches:
refs/heads/master aedf4ea5f -> c07d6c841
reduce test duration for ci
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/27e11a38
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/27e11a38
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/27e11a38
Branch: refs/heads/master
Commit: 27e11a388e96310df34652f77f9c33eceb3ed65f
Parents: aedf4ea
Author: gtully <ga...@gmail.com>
Authored: Tue May 19 11:40:03 2015 +0100
Committer: gtully <ga...@gmail.com>
Committed: Wed May 20 09:57:04 2015 +0100
----------------------------------------------------------------------
.../apache/activemq/store/kahadb/disk/index/BTreeIndexTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/27e11a38/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexTest.java
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexTest.java b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexTest.java
index ed0d12b..fa0c541 100644
--- a/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexTest.java
+++ b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexTest.java
@@ -283,7 +283,7 @@ public class BTreeIndexTest extends IndexTestSupport {
tx.commit();
Random rand = new Random(System.currentTimeMillis());
- final int count = 50000;
+ final int count = 1000;
String payload = new String(new byte[200]);
for (int i = 0; i < count; i++) {
[3/8] activemq git commit: fix sync on failover updated urls -
intermittent failure on FailoverComplexClusterTest
Posted by gt...@apache.org.
fix sync on failover updated urls - intermittent failure on FailoverComplexClusterTest
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/2536c031
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/2536c031
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/2536c031
Branch: refs/heads/master
Commit: 2536c03125e17c4d21d50489df8c01a1f0ba4bc0
Parents: 27e11a3
Author: gtully <ga...@gmail.com>
Authored: Tue May 19 11:41:49 2015 +0100
Committer: gtully <ga...@gmail.com>
Committed: Wed May 20 09:57:05 2015 +0100
----------------------------------------------------------------------
.../transport/failover/FailoverTransport.java | 25 ++++++++++----------
.../failover/FailoverComplexClusterTest.java | 3 +++
2 files changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/2536c031/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
----------------------------------------------------------------------
diff --git a/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
index 728d4b7..95c5d21 100755
--- a/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
@@ -1284,21 +1284,22 @@ public class FailoverTransport implements CompositeTransport {
@Override
public void updateURIs(boolean rebalance, URI[] updatedURIs) throws IOException {
if (isUpdateURIsSupported()) {
- HashSet<URI> copy = new HashSet<URI>(this.updated);
- updated.clear();
- if (updatedURIs != null && updatedURIs.length > 0) {
- for (URI uri : updatedURIs) {
- if (uri != null && !updated.contains(uri)) {
- updated.add(uri);
- }
- }
- if (!(copy.isEmpty() && updated.isEmpty()) && !copy.equals(new HashSet<URI>(updated))) {
- buildBackups();
- synchronized (reconnectMutex) {
- reconnect(rebalance);
+ HashSet<URI> copy = new HashSet<URI>();
+ synchronized (reconnectMutex) {
+ copy.addAll(this.updated);
+ updated.clear();
+ if (updatedURIs != null && updatedURIs.length > 0) {
+ for (URI uri : updatedURIs) {
+ if (uri != null && !updated.contains(uri)) {
+ updated.add(uri);
+ }
}
}
}
+ if (!(copy.isEmpty() && updated.isEmpty()) && !copy.equals(new HashSet<URI>(updated))) {
+ buildBackups();
+ reconnect(rebalance);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/2536c031/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverComplexClusterTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverComplexClusterTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverComplexClusterTest.java
index fab2da5..74fc0b5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverComplexClusterTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverComplexClusterTest.java
@@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory;
* broker is removed and then show 3 after the 3rd broker is reintroduced.
*/
public class FailoverComplexClusterTest extends FailoverClusterTestSupport {
+ protected final Logger LOG = LoggerFactory.getLogger(FailoverComplexClusterTest.class);
private static final String BROKER_A_CLIENT_TC_ADDRESS = "tcp://127.0.0.1:61616";
private static final String BROKER_B_CLIENT_TC_ADDRESS = "tcp://127.0.0.1:61617";
@@ -258,6 +259,7 @@ public class FailoverComplexClusterTest extends FailoverClusterTestSupport {
private void runTests(boolean multi, String tcParams, String clusterFilter, String destinationFilter) throws Exception, InterruptedException {
assertClientsConnectedToThreeBrokers();
+ LOG.info("Stopping BrokerC in prep for restart");
getBroker(BROKER_C_NAME).stop();
getBroker(BROKER_C_NAME).waitUntilStopped();
removeBroker(BROKER_C_NAME);
@@ -266,6 +268,7 @@ public class FailoverComplexClusterTest extends FailoverClusterTestSupport {
assertClientsConnectedToTwoBrokers();
+ LOG.info("Recreating BrokerC after stop");
createBrokerC(multi, tcParams, clusterFilter, destinationFilter);
getBroker(BROKER_C_NAME).waitUntilStarted();
Thread.sleep(5000);
[4/8] activemq git commit:
https://issues.apache.org/jira/browse/AMQ-5164
https://issues.apache.org/jira/browse/AMQ-4842 - master slave advisory needed
to wait for failover reconnect - exponential backoff was sometimes giving to
long a delay. Retroactive
Posted by gt...@apache.org.
https://issues.apache.org/jira/browse/AMQ-5164 https://issues.apache.org/jira/browse/AMQ-4842 - master slave advisory needed to wait for failover reconnect - exponential backoff was sometimes giving to long a delay. Retroactive override needs to applied after policies. Tests reinstated
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/9ad65c62
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/9ad65c62
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/9ad65c62
Branch: refs/heads/master
Commit: 9ad65c62ed17eef62f62c901620ed2d57171a8d0
Parents: baa10ed
Author: gtully <ga...@gmail.com>
Authored: Wed May 20 09:56:38 2015 +0100
Committer: gtully <ga...@gmail.com>
Committed: Wed May 20 09:57:05 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/activemq/broker/region/Topic.java | 13 ++++++-------
.../broker/ft/QueueMasterSlaveSingleUrlTest.java | 13 +------------
.../broker/ft/QueueMasterSlaveTestSupport.java | 11 ++++++++---
.../broker/ft/kahaDbJdbcLeaseQueueMasterSlaveTest.java | 12 +++++++-----
4 files changed, 22 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/9ad65c62/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
index a063125..21e0c1b 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
@@ -87,19 +87,18 @@ public class Topic extends BaseDestination implements Task {
DestinationStatistics parentStats, TaskRunnerFactory taskFactory) throws Exception {
super(brokerService, store, destination, parentStats);
this.topicStore = store;
- // set default subscription recovery policy
- if (AdvisorySupport.isMasterBrokerAdvisoryTopic(destination)) {
- subscriptionRecoveryPolicy = new LastImageSubscriptionRecoveryPolicy();
- setAlwaysRetroactive(true);
- } else {
- subscriptionRecoveryPolicy = new RetainedMessageSubscriptionRecoveryPolicy(null);
- }
+ subscriptionRecoveryPolicy = new RetainedMessageSubscriptionRecoveryPolicy(null);
this.taskRunner = taskFactory.createTaskRunner(this, "Topic " + destination.getPhysicalName());
}
@Override
public void initialize() throws Exception {
super.initialize();
+ // set non default subscription recovery policy (override policyEntries)
+ if (AdvisorySupport.isMasterBrokerAdvisoryTopic(destination)) {
+ subscriptionRecoveryPolicy = new LastImageSubscriptionRecoveryPolicy();
+ setAlwaysRetroactive(true);
+ }
if (store != null) {
// AMQ-2586: Better to leave this stat at zero than to give the user
// misleading metrics.
http://git-wip-us.apache.org/repos/asf/activemq/blob/9ad65c62/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java
index 7dc88f7..b7a35f4 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java
@@ -28,7 +28,7 @@ import org.junit.Ignore;
public class QueueMasterSlaveSingleUrlTest extends QueueMasterSlaveTestSupport {
private final String brokerUrl = "tcp://localhost:62001";
- private final String singleUriString = "failover://(" + brokerUrl +")?randomize=false";
+ private final String singleUriString = "failover://(" + brokerUrl +")?randomize=false&useExponentialBackOff=false";
@Override
protected void setUp() throws Exception {
@@ -81,15 +81,4 @@ public class QueueMasterSlaveSingleUrlTest extends QueueMasterSlaveTestSupport {
}).start();
}
-
- // The @Ignore is just here for documentation, since this is a JUnit3 test
- // I added the sleep because without it the two other test cases fail. I haven't looked into it, but
- // my guess whatever setUp does isn't really finished when the teardown runs.
- @Ignore("See https://issues.apache.org/jira/browse/AMQ-5164")
- @Override
- public void testAdvisory() throws Exception {
- Thread.sleep(5 * 1000);
- //super.testAdvisory();
- }
-
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/9ad65c62/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 2808ebe..a7a525e 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
@@ -44,13 +44,15 @@ abstract public class QueueMasterSlaveTestSupport extends JmsTopicSendReceiveWit
protected BrokerService master;
protected AtomicReference<BrokerService> slave = new AtomicReference<BrokerService>();
- protected CountDownLatch slaveStarted = new CountDownLatch(1);
+ protected CountDownLatch slaveStarted;
protected int inflightMessageCount;
protected int failureCount = 50;
protected String uriString = "failover://(tcp://localhost:62001,tcp://localhost:62002)?randomize=false&useExponentialBackOff=false";
@Override
protected void setUp() throws Exception {
+ slaveStarted = new CountDownLatch(1);
+ slave.set(null);
setMaxTestTime(TimeUnit.MINUTES.toMillis(10));
setAutoFail(true);
if (System.getProperty("basedir") == null) {
@@ -137,18 +139,21 @@ abstract public class QueueMasterSlaveTestSupport extends JmsTopicSendReceiveWit
qConsumer = session.createConsumer(new ActiveMQQueue("Consumer.A.VirtualTopic.TA1"));
- javax.jms.Message message = qConsumer.receive(4000);
+ javax.jms.Message message = qConsumer.receive(20000);
assertNotNull("Get message after failover", message);
assertEquals("correct message", text, ((TextMessage)message).getText());
}
public void testAdvisory() throws Exception {
MessageConsumer advConsumer = session.createConsumer(AdvisorySupport.getMasterBrokerAdvisoryTopic());
+ Message advisoryMessage = advConsumer.receive(5000);
+ LOG.info("received " + advisoryMessage);
+ assertNotNull("Didn't received advisory", advisoryMessage);
master.stop();
assertTrue("slave started", slaveStarted.await(60, TimeUnit.SECONDS));
LOG.info("slave started");
- Message advisoryMessage = advConsumer.receive(5000);
+ advisoryMessage = advConsumer.receive(20000);
LOG.info("received " + advisoryMessage);
assertNotNull("Didn't received advisory", advisoryMessage);
http://git-wip-us.apache.org/repos/asf/activemq/blob/9ad65c62/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 ee7ca0f..4cfb5e3 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
@@ -34,12 +34,19 @@ public class kahaDbJdbcLeaseQueueMasterSlaveTest extends QueueMasterSlaveTestSup
protected String MASTER_URL = "tcp://localhost:62001";
protected String SLAVE_URL = "tcp://localhost:62002";
+ @Override
protected void setUp() throws Exception {
// startup db
sharedDs = new SyncCreateDataSource((EmbeddedDataSource) DataSourceServiceSupport.createDataSource(IOHelper.getDefaultDataDirectory()));
super.setUp();
}
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ DataSourceServiceSupport.shutdownDefaultDataSource(((SyncCreateDataSource)sharedDs).getDelegate());
+ }
+
protected void createMaster() throws Exception {
master = new BrokerService();
master.setBrokerName("master");
@@ -102,11 +109,6 @@ public class kahaDbJdbcLeaseQueueMasterSlaveTest extends QueueMasterSlaveTestSup
kahaDBPersistenceAdapter.getLocker().setLockAcquireSleepInterval(500);
}
- @Override
- public void testVirtualTopicFailover() throws Exception {
- // Ignoring for now, see AMQ-4842
- }
-
protected DataSource getExistingDataSource() throws Exception {
return sharedDs;
}
[5/8] activemq git commit:
https://issues.apache.org/jira/browse/AMQ-5783 - properly remove free topic
from the store when there are no remaining subs. Issue: release of the index
but remaining metadata refs to the old state. Mbean was also left dangling
Posted by gt...@apache.org.
https://issues.apache.org/jira/browse/AMQ-5783 - properly remove free topic from the store when there are no remaining subs. Issue: release of the index but remaining metadata refs to the old state. Mbean was also left dangling. test thanks to pat fox
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/3fdf9861
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/3fdf9861
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/3fdf9861
Branch: refs/heads/master
Commit: 3fdf9861b2e17a3afbee1d2f00163fd1a38621eb
Parents: 17f4f34
Author: gtully <ga...@gmail.com>
Authored: Wed May 20 09:50:59 2015 +0100
Committer: gtully <ga...@gmail.com>
Committed: Wed May 20 09:57:05 2015 +0100
----------------------------------------------------------------------
.../broker/jmx/ManagedRegionBroker.java | 2 +-
.../activemq/store/kahadb/MessageDatabase.java | 7 +-
.../OfflineDurableSubscriberTimeoutTest.java | 214 +++++++++++++++++++
3 files changed, 219 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/3fdf9861/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
index 0770bd1..59278f1 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
@@ -302,7 +302,7 @@ public class ManagedRegionBroker extends RegionBroker {
if (name != null) {
try {
SubscriptionKey subscriptionKey = new SubscriptionKey(sub.getContext().getClientId(), sub.getConsumerInfo().getSubscriptionName());
- ObjectName inactiveName = subscriptionKeys.get(subscriptionKey);
+ ObjectName inactiveName = subscriptionKeys.remove(subscriptionKey);
if (inactiveName != null) {
inactiveDurableTopicSubscribers.remove(inactiveName);
managementContext.unregisterMBean(inactiveName);
http://git-wip-us.apache.org/repos/asf/activemq/blob/3fdf9861/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
index 41c9aba..22c967b 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
@@ -1494,9 +1494,10 @@ public abstract class MessageDatabase extends ServiceSupport implements BrokerSe
removeAckLocationsForSub(tx, sd, subscriptionKey);
if (sd.subscriptions.isEmpty(tx)) {
- sd.messageIdIndex.clear(tx);
- sd.locationIndex.clear(tx);
- sd.orderIndex.clear(tx);
+ // remove the stored destination
+ KahaRemoveDestinationCommand removeDestinationCommand = new KahaRemoveDestinationCommand();
+ removeDestinationCommand.setDestination(command.getDestination());
+ updateIndex(tx, removeDestinationCommand, null);
}
}
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/3fdf9861/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java
new file mode 100644
index 0000000..521e256
--- /dev/null
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java
@@ -0,0 +1,214 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.usecases;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.jms.Connection;
+import javax.jms.Session;
+import javax.jms.Topic;
+import junit.framework.Test;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.jmx.ManagedRegionBroker;
+import org.apache.activemq.broker.region.policy.PolicyEntry;
+import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.apache.activemq.util.DefaultTestAppender;
+import org.apache.activemq.util.Wait;
+import org.apache.log4j.Appender;
+import org.apache.log4j.Level;
+import org.apache.log4j.spi.LoggingEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class OfflineDurableSubscriberTimeoutTest extends org.apache.activemq.TestSupport {
+
+ private static final Logger LOG = LoggerFactory.getLogger(OfflineDurableSubscriberTimeoutTest.class);
+ private BrokerService broker;
+
+ @Override
+ protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
+ ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://" + getName(true));
+ connectionFactory.setWatchTopicAdvisories(false);
+ return connectionFactory;
+ }
+
+ @Override
+ protected Connection createConnection() throws Exception {
+ return createConnection("id");
+ }
+
+ protected Connection createConnection(String name) throws Exception {
+ Connection con = getConnectionFactory().createConnection();
+ con.setClientID(name);
+ con.start();
+ return con;
+ }
+
+ public static Test suite() {
+ return suite(OfflineDurableSubscriberTimeoutTest.class);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ createBroker();
+ super.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ destroyBroker();
+ }
+
+ private void createBroker() throws Exception {
+ createBroker(true);
+ }
+
+ private void createBroker(boolean deleteAllMessages) throws Exception {
+ broker = BrokerFactory.createBroker("broker:(vm://" + getName(true) + ")");
+ broker.setBrokerName(getName(true));
+ broker.setDeleteAllMessagesOnStartup(deleteAllMessages);
+ broker.getManagementContext().setCreateConnector(false);
+ broker.setAdvisorySupport(false);
+
+ setDefaultPersistenceAdapter(broker);
+
+ ((KahaDBPersistenceAdapter) broker.getPersistenceAdapter()).getStore().getPageFile().setPageSize(1024);
+
+ PolicyMap policyMap = new PolicyMap();
+ PolicyEntry policyEntry = new PolicyEntry();
+ policyEntry.setExpireMessagesPeriod(1000);
+
+ policyEntry.setProducerFlowControl(true);
+ policyMap.put(new ActiveMQTopic(">"), policyEntry);
+ broker.setDestinationPolicy(policyMap);
+
+ broker.setOfflineDurableSubscriberTaskSchedule(1000);
+ broker.setOfflineDurableSubscriberTimeout(2004);
+
+ broker.setDestinations(new ActiveMQDestination[]{
+ new ActiveMQTopic("topic1")
+ });
+
+ broker.start();
+ }
+
+ private void destroyBroker() throws Exception {
+ if (broker != null)
+ broker.stop();
+ }
+
+ public void testOfflineDurableSubscriberTimeout() throws Exception {
+
+ final AtomicBoolean foundLogMessage = new AtomicBoolean(false);
+ Appender appender = new DefaultTestAppender() {
+ @Override
+ public void doAppend(LoggingEvent event) {
+ if (event.getLevel().isGreaterOrEqual(Level.WARN)) {
+ LOG.info("received unexpected log message: " + event.getMessage());
+ foundLogMessage.set(true);
+ }
+ }
+ };
+
+ org.apache.log4j.Logger log4jLoggerMRB =
+ org.apache.log4j.Logger.getLogger(ManagedRegionBroker.class);
+ org.apache.log4j.Logger log4jLoggerT =
+ org.apache.log4j.Logger.getLogger(org.apache.activemq.broker.region.Topic.class);
+
+ log4jLoggerMRB.addAppender(appender);
+ log4jLoggerT.addAppender(appender);
+
+ try {
+
+ createOfflineDurableSubscribers("topic_new");
+
+ assertTrue(Wait.waitFor(new Wait.Condition() {
+ @Override
+ public boolean isSatisified() throws Exception {
+ LOG.info("broker.getAdminView().getInactiveDurableTopicSubscribers():" + broker.getAdminView().getInactiveDurableTopicSubscribers().length);
+ return broker.getAdminView().getInactiveDurableTopicSubscribers().length == 1;
+ }
+ }));
+ assertTrue(Wait.waitFor(new Wait.Condition() {
+ @Override
+ public boolean isSatisified() throws Exception {
+ return broker.getAdminView().getInactiveDurableTopicSubscribers().length == 0;
+ }
+ }));
+
+
+ broker.stop();
+ broker.waitUntilStopped();
+
+ createBroker(false);
+ broker.waitUntilStarted();
+
+ createOfflineDurableSubscribers("topic_new");
+
+ assertTrue(Wait.waitFor(new Wait.Condition() {
+ @Override
+ public boolean isSatisified() throws Exception {
+ return broker.getAdminView().getInactiveDurableTopicSubscribers().length == 1;
+ }
+ }));
+
+ assertTrue(Wait.waitFor(new Wait.Condition() {
+ @Override
+ public boolean isSatisified() throws Exception {
+ return broker.getAdminView().getInactiveDurableTopicSubscribers().length == 0;
+ }
+ }));
+
+ LOG.info("Create Consumer for topic1");
+ //create connection to topic that is experiencing warning
+ createOfflineDurableSubscribers("topic1");
+
+
+ assertTrue(Wait.waitFor(new Wait.Condition() {
+ @Override
+ public boolean isSatisified() throws Exception {
+ return broker.getAdminView().getInactiveDurableTopicSubscribers().length == 1;
+ }
+ }));
+
+ assertTrue(Wait.waitFor(new Wait.Condition() {
+ @Override
+ public boolean isSatisified() throws Exception {
+ return broker.getAdminView().getInactiveDurableTopicSubscribers().length == 0;
+ }
+ }));
+
+ assertFalse("have not found any log warn/error", foundLogMessage.get());
+ } finally {
+ log4jLoggerMRB.removeAppender(appender);
+ log4jLoggerT.removeAppender(appender);
+ }
+ }
+
+ private void createOfflineDurableSubscribers(String topic) throws Exception {
+ Connection con = createConnection();
+ Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ session.createDurableSubscriber((Topic) createDestination(topic), "sub1", null, true);
+ session.close();
+ con.close();
+ }
+}
\ No newline at end of file
[6/8] activemq git commit: more derby shutdown woes resolved
Posted by gt...@apache.org.
more derby shutdown woes resolved
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/baa10ed3
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/baa10ed3
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/baa10ed3
Branch: refs/heads/master
Commit: baa10ed33e870cacf4eabcfc4167887c89b7a0d1
Parents: 3fdf986
Author: gtully <ga...@gmail.com>
Authored: Wed May 20 09:53:32 2015 +0100
Committer: gtully <ga...@gmail.com>
Committed: Wed May 20 09:57:05 2015 +0100
----------------------------------------------------------------------
.../org/apache/activemq/store/jdbc/DataSourceServiceSupport.java | 4 ----
.../apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java | 1 +
2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/baa10ed3/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/DataSourceServiceSupport.java
----------------------------------------------------------------------
diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/DataSourceServiceSupport.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/DataSourceServiceSupport.java
index e36a66b..9790d3d 100644
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/DataSourceServiceSupport.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/DataSourceServiceSupport.java
@@ -98,10 +98,6 @@ abstract public class DataSourceServiceSupport extends LockableServiceSupport {
final EmbeddedDataSource ds = new EmbeddedDataSource();
ds.setDatabaseName("derbydb");
ds.setCreateDatabase("create");
- try {
- ds.getConnection().close();
- } catch (SQLException ignored) {
- }
return ds;
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/baa10ed3/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java
index 514dd4a..4881b2f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java
@@ -26,6 +26,7 @@ public class JDBCNetworkBrokerDetachTest extends NetworkBrokerDetachTest {
JDBCPersistenceAdapter jdbc = new JDBCPersistenceAdapter();
EmbeddedDataSource dataSource = (EmbeddedDataSource) jdbc.getDataSource();
dataSource.setDatabaseName(broker.getBrokerName());
+ dataSource.getConnection().close(); // ensure derby for brokerName is initialized
broker.setPersistenceAdapter(jdbc);
broker.setUseVirtualTopics(false);
}
[7/8] activemq git commit: fix formatting
Posted by gt...@apache.org.
fix formatting
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/9ae5b414
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/9ae5b414
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/9ae5b414
Branch: refs/heads/master
Commit: 9ae5b4147b9f6f078ca43d6dcdcc2874c907d099
Parents: 9ad65c6
Author: gtully <ga...@gmail.com>
Authored: Wed May 20 12:50:33 2015 +0100
Committer: gtully <ga...@gmail.com>
Committed: Wed May 20 12:50:33 2015 +0100
----------------------------------------------------------------------
.../activemq/store/kahadb/KahaDBStore.java | 34 ++++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/9ae5b414/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
index f6ef482..7e06a57 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
@@ -425,26 +425,26 @@ public class KahaDBStore extends MessageDatabase implements PersistenceAdapter {
command.setPrioritySupported(isPrioritizedMessages());
org.apache.activemq.util.ByteSequence packet = wireFormat.marshal(message);
command.setMessage(new Buffer(packet.getData(), packet.getOffset(), packet.getLength()));
- store(command, isEnableJournalDiskSyncs() && message.isResponseRequired(), new IndexAware() {
- // sync add? (for async, future present from getFutureOrSequenceLong)
- Object possibleFuture = message.getMessageId().getFutureOrSequenceLong();
+ store(command, isEnableJournalDiskSyncs() && message.isResponseRequired(), new IndexAware() {
+ // sync add? (for async, future present from getFutureOrSequenceLong)
+ Object possibleFuture = message.getMessageId().getFutureOrSequenceLong();
- @Override
- public void sequenceAssignedWithIndexLocked(final long sequence) {
- message.getMessageId().setFutureOrSequenceLong(sequence);
- if (indexListener != null) {
- if (possibleFuture == null) {
- trackPendingAdd(dest, sequence);
- indexListener.onAdd(new IndexListener.MessageContext(context, message, new Runnable() {
- @Override
- public void run() {
- trackPendingAddComplete(dest, sequence);
- }
- }));
- }
+ @Override
+ public void sequenceAssignedWithIndexLocked(final long sequence) {
+ message.getMessageId().setFutureOrSequenceLong(sequence);
+ if (indexListener != null) {
+ if (possibleFuture == null) {
+ trackPendingAdd(dest, sequence);
+ indexListener.onAdd(new IndexListener.MessageContext(context, message, new Runnable() {
+ @Override
+ public void run() {
+ trackPendingAddComplete(dest, sequence);
+ }
+ }));
}
}
- }, null);
+ }
+ }, null);
}
@Override
[2/8] activemq git commit: more tidy up of derby usage in tests to
ensure proper cleanup; ci failures
Posted by gt...@apache.org.
more tidy up of derby usage in tests to ensure proper cleanup; ci failures
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/17f4f349
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/17f4f349
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/17f4f349
Branch: refs/heads/master
Commit: 17f4f349f3fc8432ee1d39bf354f48d3fcdb9ae2
Parents: 2536c03
Author: gtully <ga...@gmail.com>
Authored: Tue May 19 11:44:11 2015 +0100
Committer: gtully <ga...@gmail.com>
Committed: Wed May 20 09:57:05 2015 +0100
----------------------------------------------------------------------
.../org/apache/activemq/broker/LockableServiceSupport.java | 1 +
.../activemq/network/DemandForwardingBridgeSupport.java | 2 +-
.../activemq/store/jdbc/DataSourceServiceSupport.java | 5 +++++
.../test/java/org/apache/activemq/broker/AMQ4351Test.java | 4 +---
.../apache/activemq/broker/JdbcXARecoveryBrokerTest.java | 9 ++-------
.../activemq/broker/store/RecoverExpiredMessagesTest.java | 5 ++++-
6 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/17f4f349/activemq-broker/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java b/activemq-broker/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java
index 18199ce..786eefb 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java
@@ -112,6 +112,7 @@ public abstract class LockableServiceSupport extends ServiceSupport implements L
}
if (locker != null) {
getLocker().stop();
+ locker = null;
}
}
ThreadPoolUtils.shutdown(clockDaemon);
http://git-wip-us.apache.org/repos/asf/activemq/blob/17f4f349/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
index 22ac0d8..1b77e73 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
@@ -1040,7 +1040,7 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br
} else if (command.isBrokerInfo()) {
futureLocalBrokerInfo.set((BrokerInfo) command);
} else if (command.isShutdownInfo()) {
- LOG.info("{} Shutting down", configuration.getBrokerName());
+ LOG.info("{} Shutting down {}", configuration.getBrokerName(), configuration.getName());
stop();
} else if (command.getClass() == ConnectionError.class) {
ConnectionError ce = (ConnectionError) command;
http://git-wip-us.apache.org/repos/asf/activemq/blob/17f4f349/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/DataSourceServiceSupport.java
----------------------------------------------------------------------
diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/DataSourceServiceSupport.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/DataSourceServiceSupport.java
index db1888d..e36a66b 100644
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/DataSourceServiceSupport.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/DataSourceServiceSupport.java
@@ -98,11 +98,16 @@ abstract public class DataSourceServiceSupport extends LockableServiceSupport {
final EmbeddedDataSource ds = new EmbeddedDataSource();
ds.setDatabaseName("derbydb");
ds.setCreateDatabase("create");
+ try {
+ ds.getConnection().close();
+ } catch (SQLException ignored) {
+ }
return ds;
}
public static void shutdownDefaultDataSource(DataSource dataSource) {
final EmbeddedDataSource ds = (EmbeddedDataSource) dataSource;
+ ds.setCreateDatabase("shutdown");
ds.setShutdownDatabase("shutdown");
try {
ds.getConnection();
http://git-wip-us.apache.org/repos/asf/activemq/blob/17f4f349/activemq-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java
index 0b0e5cc..1cf259b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java
@@ -60,11 +60,9 @@ public class AMQ4351Test extends BrokerTestSupport {
broker.setOfflineDurableSubscriberTaskSchedule(500);
broker.setOfflineDurableSubscriberTimeout(2000); // lets delete durable subs much faster.
- System.setProperty("derby.system.home", new File(IOHelper.getDefaultDataDirectory()).getCanonicalPath());
-
JDBCPersistenceAdapter jdbc = new JDBCPersistenceAdapter();
- jdbc.deleteAllMessages();
broker.setPersistenceAdapter(jdbc);
+ broker.setDeleteAllMessagesOnStartup(true);
return broker;
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/17f4f349/activemq-unit-tests/src/test/java/org/apache/activemq/broker/JdbcXARecoveryBrokerTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/JdbcXARecoveryBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/JdbcXARecoveryBrokerTest.java
index 35b944a..4b72538 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/JdbcXARecoveryBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/JdbcXARecoveryBrokerTest.java
@@ -20,6 +20,7 @@ import java.io.File;
import junit.framework.Test;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.store.jdbc.DataSourceServiceSupport;
import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
import org.apache.activemq.util.IOHelper;
import org.apache.derby.jdbc.EmbeddedDataSource;
@@ -67,13 +68,7 @@ public class JdbcXARecoveryBrokerTest extends XARecoveryBrokerTest {
private void stopDerby() {
LOG.info("STOPPING DB!@!!!!");
- final EmbeddedDataSource ds = dataSource;
- try {
- ds.setShutdownDatabase("shutdown");
- ds.getConnection();
- } catch (Exception ignored) {
- }
-
+ DataSourceServiceSupport.shutdownDefaultDataSource(dataSource);
}
public static Test suite() {
http://git-wip-us.apache.org/repos/asf/activemq/blob/17f4f349/activemq-unit-tests/src/test/java/org/apache/activemq/broker/store/RecoverExpiredMessagesTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/store/RecoverExpiredMessagesTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/store/RecoverExpiredMessagesTest.java
index fb0296c..581311d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/store/RecoverExpiredMessagesTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/store/RecoverExpiredMessagesTest.java
@@ -56,7 +56,7 @@ public class RecoverExpiredMessagesTest extends BrokerRestartTestSupport {
addCombinationValues("queuePendingPolicy", new PendingQueueMessageStoragePolicy[] {new FilePendingQueueMessageStoragePolicy(), new VMPendingQueueMessageStoragePolicy()});
PersistenceAdapter[] persistenceAdapters = new PersistenceAdapter[] {
new KahaDBPersistenceAdapter(),
- new JDBCPersistenceAdapter(JDBCPersistenceAdapter.createDataSource(IOHelper.getDefaultDataDirectory()), new OpenWireFormat())
+ new JDBCPersistenceAdapter()
};
for (PersistenceAdapter adapter : persistenceAdapters) {
adapter.setDirectory(new File(IOHelper.getDefaultDataDirectory()));
@@ -134,6 +134,9 @@ public class RecoverExpiredMessagesTest extends BrokerRestartTestSupport {
@Override
protected void configureBroker(BrokerService broker) throws Exception {
super.configureBroker(broker);
+ if (persistenceAdapter instanceof JDBCPersistenceAdapter) {
+ ((JDBCPersistenceAdapter) persistenceAdapter).setLockDataSource(null);
+ }
broker.setPersistenceAdapter(persistenceAdapter);
}
[8/8] activemq git commit:
https://issues.apache.org/jira/browse/AMQ-4842 - the store needed to be
shared between master and slave
Posted by gt...@apache.org.
https://issues.apache.org/jira/browse/AMQ-4842 - the store needed to be shared between master and slave
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/c07d6c84
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c07d6c84
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c07d6c84
Branch: refs/heads/master
Commit: c07d6c841dce765d58fc97139d3e76873a257b59
Parents: 9ae5b41
Author: gtully <ga...@gmail.com>
Authored: Wed May 20 13:42:49 2015 +0100
Committer: gtully <ga...@gmail.com>
Committed: Wed May 20 13:42:49 2015 +0100
----------------------------------------------------------------------
.../broker/ft/QueueMasterSlaveTestSupport.java | 27 ++++++++++++++------
.../ft/kahaDbJdbcLeaseQueueMasterSlaveTest.java | 9 ++++++-
2 files changed, 27 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/c07d6c84/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 a7a525e..570b5f1 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
@@ -31,6 +31,7 @@ import org.apache.activemq.advisory.AdvisorySupport;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.util.Wait;
import org.apache.activemq.xbean.BrokerFactoryBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -134,28 +135,38 @@ abstract public class QueueMasterSlaveTestSupport extends JmsTopicSendReceiveWit
assertTrue("slave started", slaveStarted.await(60, TimeUnit.SECONDS));
assertTrue(!slave.get().isSlave());
+ LOG.info("Sending post failover message to VT");
+
final String text = "ForUWhenSlaveKicksIn";
producer.send(new ActiveMQTopic("VirtualTopic.TA1"), session.createTextMessage(text));
+ // dest must survive failover - consumer created after send
qConsumer = session.createConsumer(new ActiveMQQueue("Consumer.A.VirtualTopic.TA1"));
- javax.jms.Message message = qConsumer.receive(20000);
+ javax.jms.Message message = qConsumer.receive(10000);
assertNotNull("Get message after failover", message);
assertEquals("correct message", text, ((TextMessage)message).getText());
}
public void testAdvisory() throws Exception {
- MessageConsumer advConsumer = session.createConsumer(AdvisorySupport.getMasterBrokerAdvisoryTopic());
- Message advisoryMessage = advConsumer.receive(5000);
- LOG.info("received " + advisoryMessage);
- assertNotNull("Didn't received advisory", advisoryMessage);
+ final MessageConsumer advConsumer = session.createConsumer(AdvisorySupport.getMasterBrokerAdvisoryTopic());
+ final Message[] advisoryMessage = new Message[1];
+ advisoryMessage[0] = advConsumer.receive(5000);
+ LOG.info("received " + advisoryMessage[0]);
+ assertNotNull("Didn't received advisory", advisoryMessage[0]);
master.stop();
assertTrue("slave started", slaveStarted.await(60, TimeUnit.SECONDS));
LOG.info("slave started");
- advisoryMessage = advConsumer.receive(20000);
- LOG.info("received " + advisoryMessage);
- assertNotNull("Didn't received advisory", advisoryMessage);
+ Wait.waitFor(new Wait.Condition() {
+ @Override
+ public boolean isSatisified() throws Exception {
+ advisoryMessage[0] = advConsumer.receive(500);
+ return advisoryMessage[0] != null;
+ }
+ });
+ LOG.info("received " + advisoryMessage[0]);
+ assertNotNull("Didn't received advisory", advisoryMessage[0]);
}
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/c07d6c84/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 4cfb5e3..c14506f 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
@@ -16,6 +16,7 @@
*/
package org.apache.activemq.broker.ft;
+import java.io.File;
import java.io.IOException;
import java.net.URI;
import javax.sql.DataSource;
@@ -33,11 +34,13 @@ public class kahaDbJdbcLeaseQueueMasterSlaveTest extends QueueMasterSlaveTestSup
protected DataSource sharedDs;
protected String MASTER_URL = "tcp://localhost:62001";
protected String SLAVE_URL = "tcp://localhost:62002";
+ File sharedDbDirFile;
@Override
protected void setUp() throws Exception {
// startup db
sharedDs = new SyncCreateDataSource((EmbeddedDataSource) DataSourceServiceSupport.createDataSource(IOHelper.getDefaultDataDirectory()));
+ sharedDbDirFile = new File(new File(IOHelper.getDefaultDataDirectory()), "sharedKahaDB");
super.setUp();
}
@@ -47,6 +50,7 @@ public class kahaDbJdbcLeaseQueueMasterSlaveTest extends QueueMasterSlaveTestSup
DataSourceServiceSupport.shutdownDefaultDataSource(((SyncCreateDataSource)sharedDs).getDelegate());
}
+ @Override
protected void createMaster() throws Exception {
master = new BrokerService();
master.setBrokerName("master");
@@ -55,6 +59,7 @@ public class kahaDbJdbcLeaseQueueMasterSlaveTest extends QueueMasterSlaveTestSup
master.setPersistent(true);
master.setDeleteAllMessagesOnStartup(true);
KahaDBPersistenceAdapter kahaDBPersistenceAdapter = (KahaDBPersistenceAdapter) master.getPersistenceAdapter();
+ kahaDBPersistenceAdapter.setDirectory(sharedDbDirFile);
LeaseDatabaseLocker leaseDatabaseLocker = new LeaseDatabaseLocker();
leaseDatabaseLocker.setCreateTablesOnStartup(true);
leaseDatabaseLocker.setDataSource(getExistingDataSource());
@@ -63,6 +68,7 @@ public class kahaDbJdbcLeaseQueueMasterSlaveTest extends QueueMasterSlaveTestSup
configureLocker(kahaDBPersistenceAdapter);
configureBroker(master);
master.start();
+ master.waitUntilStarted();
}
protected void configureBroker(BrokerService brokerService) {
@@ -86,14 +92,15 @@ public class kahaDbJdbcLeaseQueueMasterSlaveTest extends QueueMasterSlaveTestSup
broker.setUseJmx(false);
broker.setPersistent(true);
KahaDBPersistenceAdapter kahaDBPersistenceAdapter = (KahaDBPersistenceAdapter) broker.getPersistenceAdapter();
+ kahaDBPersistenceAdapter.setDirectory(sharedDbDirFile);
LeaseDatabaseLocker leaseDatabaseLocker = new LeaseDatabaseLocker();
leaseDatabaseLocker.setDataSource(getExistingDataSource());
leaseDatabaseLocker.setStatements(new Statements());
kahaDBPersistenceAdapter.setLocker(leaseDatabaseLocker);
configureLocker(kahaDBPersistenceAdapter);
configureBroker(broker);
- broker.start();
slave.set(broker);
+ broker.start();
slaveStarted.countDown();
} catch (IllegalStateException expectedOnShutdown) {
} catch (Exception e) {