You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2016/11/29 16:38:14 UTC

activemq git commit: Add example using retroactive customer with a fixedsubscriptionrecoverypolicy for JMS Topic and broker restarted. Thanks to Charles Moulliard for the patch. This fixes #94.

Repository: activemq
Updated Branches:
  refs/heads/master 100ccdfde -> 4e766d92c


Add example using retroactive customer with a fixedsubscriptionrecoverypolicy for JMS Topic and broker restarted. Thanks to Charles Moulliard for the patch. This fixes #94.


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/4e766d92
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/4e766d92
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/4e766d92

Branch: refs/heads/master
Commit: 4e766d92c5d210cfbaa08f9c59ec7379affe23a3
Parents: 100ccdf
Author: Claus Ibsen <cl...@gmail.com>
Authored: Tue Nov 29 17:38:06 2016 +0100
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Tue Nov 29 17:38:06 2016 +0100

----------------------------------------------------------------------
 .../RetroactiveConsumerBrokerRestartedTest.java | 167 +++++++++++++++++++
 1 file changed, 167 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/4e766d92/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerBrokerRestartedTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerBrokerRestartedTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerBrokerRestartedTest.java
new file mode 100644
index 0000000..f6b0b8f
--- /dev/null
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerBrokerRestartedTest.java
@@ -0,0 +1,167 @@
+/**
+ * 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.test.retroactive;
+
+import junit.framework.TestCase;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.region.policy.FixedCountSubscriptionRecoveryPolicy;
+import org.apache.activemq.broker.region.policy.PolicyEntry;
+import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.broker.region.policy.SimpleDispatchPolicy;
+import org.apache.activemq.store.PersistenceAdapter;
+import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jms.*;
+
+public class RetroactiveConsumerBrokerRestartedTest extends TestCase {
+
+    private static final Logger log = LoggerFactory.getLogger(RetroactiveConsumerBrokerRestartedTest.class);
+    private final static String ACTIVEMQ_BROKER_URI = "tcp://localhost:62626";
+
+    private BrokerService broker;
+    Connection connection;
+
+    @Override
+    protected void setUp() throws Exception {
+        createBroker();
+        connection = getConnection();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        broker.stop();
+    }
+
+    protected void restartBroker() throws Exception {
+        if (connection != null) {
+            connection.close();
+        }
+        if (broker != null) {
+            broker.stop();
+            broker.waitUntilStopped();
+        }
+        createRestartedBroker();
+    }
+
+    private void createBroker() throws Exception {
+        PolicyEntry policy = new PolicyEntry();
+        policy.setTopic(">");
+        policy.setDispatchPolicy(new SimpleDispatchPolicy());
+        FixedCountSubscriptionRecoveryPolicy fixed = new FixedCountSubscriptionRecoveryPolicy();
+        fixed.setMaximumSize(10);
+        policy.setSubscriptionRecoveryPolicy(fixed);
+        PolicyMap policyMap = new PolicyMap();
+        policyMap.setDefaultEntry(policy);
+
+        broker = new BrokerService();
+        broker.setBrokerName("durable-broker");
+        broker.setDeleteAllMessagesOnStartup(true);
+        broker.setPersistenceAdapter(createPersistenceAdapter());
+        broker.setPersistent(true);
+        broker.setDestinationPolicy(policyMap);
+
+        broker.addConnector(ACTIVEMQ_BROKER_URI);
+        broker.start();
+        broker.waitUntilStarted();
+    }
+
+    private void createRestartedBroker() throws Exception {
+        PolicyEntry policy = new PolicyEntry();
+        policy.setTopic(">");
+        policy.setDispatchPolicy(new SimpleDispatchPolicy());
+        FixedCountSubscriptionRecoveryPolicy fixed = new FixedCountSubscriptionRecoveryPolicy();
+        fixed.setMaximumSize(10);
+        policy.setSubscriptionRecoveryPolicy(fixed);
+        PolicyMap policyMap = new PolicyMap();
+        policyMap.setDefaultEntry(policy);
+
+        broker = new BrokerService();
+        broker.setBrokerName("durable-broker");
+        broker.setDeleteAllMessagesOnStartup(false);
+        broker.setPersistenceAdapter(createPersistenceAdapter());
+        broker.setPersistent(true);
+        broker.setDestinationPolicy(policyMap);
+
+        broker.addConnector(ACTIVEMQ_BROKER_URI);
+        broker.start();
+        broker.waitUntilStarted();
+    }
+
+    protected PersistenceAdapter createPersistenceAdapter() throws Exception {
+        KahaDBPersistenceAdapter adapter = new KahaDBPersistenceAdapter();
+        return adapter;
+    }
+
+    protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
+        return new ActiveMQConnectionFactory(ACTIVEMQ_BROKER_URI);
+    }
+
+    private Connection getConnection() throws Exception {
+        Connection connection = createConnectionFactory().createConnection();
+        connection.setClientID("cliId1");
+        return connection;
+    }
+
+    public void testFixedCountSubscriptionRecoveryPolicy() throws Exception {
+
+        connection.start();
+
+        // Create the durable sub.
+        Session session = connection.createSession(false, javax.jms.Session.AUTO_ACKNOWLEDGE);
+
+        // Ensure that consumer will receive messages sent before it was created
+        Topic topicSub = session.createTopic("TestTopic?consumer.retroactive=true");
+        Topic topic = session.createTopic("TestTopic");
+        TopicSubscriber sub1 = session.createDurableSubscriber(topicSub, "sub1");
+
+        // Produce a message
+        MessageProducer producer = session.createProducer(topic);
+        producer.setDeliveryMode(DeliveryMode.PERSISTENT);
+
+        // Make sure it works when the durable sub is active.
+        producer.send(session.createTextMessage("Msg:1"));
+        producer.send(session.createTextMessage("Msg:2"));
+        producer.send(session.createTextMessage("Msg:3"));
+
+        restartBroker();
+
+        connection = getConnection();
+        connection.start();
+        session = connection.createSession(false, javax.jms.Session.AUTO_ACKNOWLEDGE);
+        producer = session.createProducer(topic);
+        producer.setDeliveryMode(DeliveryMode.PERSISTENT);
+        producer.send(session.createTextMessage("Msg:4"));
+
+        // Recreate the subscriber to check if it will be able to recover the messages
+        sub1 = session.createDurableSubscriber(topicSub, "sub1");
+
+        // Try to get the messages
+        assertTextMessageEquals("Msg:1", sub1.receive(1000));
+        assertTextMessageEquals("Msg:2", sub1.receive(1000));
+        assertTextMessageEquals("Msg:3", sub1.receive(1000));
+        assertTextMessageEquals("Msg:4", sub1.receive(1000));
+    }
+
+    private void assertTextMessageEquals(String string, Message message) throws JMSException {
+        assertNotNull("Message was null", message);
+        assertTrue("Message is not a TextMessage", message instanceof TextMessage);
+        assertEquals(string, ((TextMessage) message).getText());
+    }
+}