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 2017/06/01 11:00:13 UTC
activemq git commit: [AMQ-6693] ignore the long term connection
associated with the broker context, fix and test
Repository: activemq
Updated Branches:
refs/heads/master d2c0eddaa -> c50dc6ff0
[AMQ-6693] ignore the long term connection associated with the broker context, fix and test
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/c50dc6ff
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c50dc6ff
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c50dc6ff
Branch: refs/heads/master
Commit: c50dc6ff00aa864f22cf7527e733a36567214f0b
Parents: d2c0edd
Author: gtully <ga...@gmail.com>
Authored: Thu Jun 1 12:00:04 2017 +0100
Committer: gtully <ga...@gmail.com>
Committed: Thu Jun 1 12:00:04 2017 +0100
----------------------------------------------------------------------
.../store/jdbc/JDBCPersistenceAdapter.java | 6 +-
.../store/jdbc/JDBCConcurrentDLQTest.java | 210 +++++++++++++++++++
2 files changed, 215 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/c50dc6ff/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java
----------------------------------------------------------------------
diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java
index 8cb6000..5da7592 100644
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java
@@ -484,7 +484,7 @@ public class JDBCPersistenceAdapter extends DataSourceServiceSupport implements
}
public TransactionContext getTransactionContext(ConnectionContext context) throws IOException {
- if (context == null) {
+ if (context == null || isBrokerContext(context)) {
return getTransactionContext();
} else {
TransactionContext answer = (TransactionContext)context.getLongTermStoreContext();
@@ -496,6 +496,10 @@ public class JDBCPersistenceAdapter extends DataSourceServiceSupport implements
}
}
+ private boolean isBrokerContext(ConnectionContext context) {
+ return context.getSecurityContext() != null && context.getSecurityContext().isBrokerContext();
+ }
+
public TransactionContext getTransactionContext() throws IOException {
TransactionContext answer = new TransactionContext(this);
if (transactionIsolation > 0) {
http://git-wip-us.apache.org/repos/asf/activemq/blob/c50dc6ff/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCConcurrentDLQTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCConcurrentDLQTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCConcurrentDLQTest.java
new file mode 100644
index 0000000..8fc94d1
--- /dev/null
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCConcurrentDLQTest.java
@@ -0,0 +1,210 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.store.jdbc;
+
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.RedeliveryPolicy;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.region.RegionBroker;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.util.DefaultIOExceptionHandler;
+import org.apache.activemq.util.DefaultTestAppender;
+import org.apache.log4j.Appender;
+import org.apache.log4j.Level;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jms.*;
+import java.io.IOException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+
+public class JDBCConcurrentDLQTest {
+
+ private static final Logger LOG = LoggerFactory.getLogger(JDBCConcurrentDLQTest.class);
+
+ BrokerService broker;
+ JDBCPersistenceAdapter jdbcPersistenceAdapter;
+ Appender appender = null;
+ final AtomicBoolean gotError = new AtomicBoolean(false);
+
+ @Before
+ public void setUp() throws Exception {
+ gotError.set(false);
+ broker = createBroker();
+ broker.start();
+ broker.waitUntilStarted();
+
+ appender = new DefaultTestAppender() {
+ @Override
+ public void doAppend(org.apache.log4j.spi.LoggingEvent event) {
+ if (event.getLevel().toInt() > Level.INFO_INT) {
+ LOG.error("Got error from log:" + event.getRenderedMessage());
+ gotError.set(true);
+ }
+ }
+ };
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ org.apache.log4j.Logger.getLogger(RegionBroker.class).removeAppender(appender);
+ org.apache.log4j.Logger.getLogger(JDBCPersistenceAdapter.class).removeAppender(appender);
+
+ broker.stop();
+ }
+
+ protected BrokerService createBroker() throws Exception {
+ broker = new BrokerService();
+ broker.setUseJmx(true);
+ broker.setAdvisorySupport(false);
+ jdbcPersistenceAdapter = new JDBCPersistenceAdapter();
+ jdbcPersistenceAdapter.setUseLock(false);
+ broker.setPersistenceAdapter(jdbcPersistenceAdapter);
+ broker.setDeleteAllMessagesOnStartup(true);
+ broker.addConnector("tcp://0.0.0.0:0");
+ return broker;
+ }
+
+
+ @Test
+ public void testConcurrentDlqOk() throws Exception {
+
+ final Destination dest = new ActiveMQQueue("DD");
+
+ final ActiveMQConnectionFactory amq = new ActiveMQConnectionFactory(broker.getTransportConnectorByScheme("tcp").getPublishableConnectString());
+ amq.setWatchTopicAdvisories(false);
+
+ broker.setIoExceptionHandler(new DefaultIOExceptionHandler() {
+ @Override
+ public void handle(IOException exception) {
+ LOG.error("handle IOException from store", exception);
+ gotError.set(true);
+ }
+ });
+ org.apache.log4j.Logger.getLogger(RegionBroker.class).addAppender(appender);
+ org.apache.log4j.Logger.getLogger(JDBCPersistenceAdapter.class).addAppender(appender);
+
+ final int numMessages = 100;
+ final AtomicInteger consumed = new AtomicInteger(numMessages);
+ produceMessages(amq, dest, numMessages);
+ ExecutorService executorService = Executors.newCachedThreadPool();
+
+ for (int i = 0; i < 50; i++) {
+ executorService.execute(new Runnable() {
+ @Override
+ public void run() {
+ Connection connection = null;
+ Session session = null;
+ MessageConsumer consumer = null;
+
+ try {
+ connection = amq.createConnection();
+ connection.setExceptionListener(new javax.jms.ExceptionListener() {
+ public void onException(javax.jms.JMSException e) {
+ e.printStackTrace();
+ }
+ });
+
+ //set custom redelivery policy with 0 retries to force move to DLQ
+ RedeliveryPolicy queuePolicy = new RedeliveryPolicy();
+ queuePolicy.setMaximumRedeliveries(0);
+ ((ActiveMQConnection) connection).setRedeliveryPolicy(queuePolicy);
+ connection.start();
+
+ session = connection.createSession(true, Session.SESSION_TRANSACTED);
+
+ consumer = session.createConsumer(dest);
+
+ while (consumed.get() > 0 && !gotError.get()) {
+ Message message = consumer.receive(4000);
+ if (message != null) {
+ consumed.decrementAndGet();
+ session.rollback();
+ }
+ }
+ } catch (Exception e) {
+ LOG.error("Error on consumption", e);
+ gotError.set(true);
+ } finally {
+ try {
+ if (connection != null) {
+ connection.close();
+ }
+ } catch (Exception ignored) {}
+ }
+
+ }
+ });
+ }
+
+ executorService.shutdown();
+ boolean allComplete = executorService.awaitTermination(60, TimeUnit.SECONDS);
+ executorService.shutdownNow();
+ LOG.info("Total messages: " + broker.getAdminView().getTotalMessageCount());
+ LOG.info("Total enqueues: " + broker.getAdminView().getTotalEnqueueCount());
+ LOG.info("Total deueues: " + broker.getAdminView().getTotalDequeueCount());
+
+ assertTrue(allComplete);
+ assertEquals("all consumed", 0l, consumed.get());
+ assertEquals("all messages get to the dlq", numMessages * 2, broker.getAdminView().getTotalEnqueueCount());
+ assertEquals("all messages acked", numMessages, broker.getAdminView().getTotalDequeueCount());
+ assertFalse("no error", gotError.get());
+
+ }
+
+ private void produceMessages(ActiveMQConnectionFactory amq, Destination dest, int numMessages) throws JMSException {
+ Connection connection = amq.createConnection();
+
+ connection.setExceptionListener(new javax.jms.ExceptionListener() {
+ public void onException(javax.jms.JMSException e) {
+ e.printStackTrace();
+ }
+ });
+ connection.start();
+
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageProducer producer = session.createProducer(dest);
+ long counter = 0;
+ TextMessage message = session.createTextMessage();
+
+ for (int i = 0; i < numMessages; i++) {
+ producer.send(message);
+ counter++;
+
+ if ((counter % 50) == 0) {
+ LOG.info("sent " + counter + " messages");
+ }
+ }
+
+ if (connection != null) {
+ connection.close();
+ }
+ }
+}