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/09/28 15:41:34 UTC
[2/2] activemq git commit:
https://issues.apache.org/jira/browse/AMQ-5854 - fix and test. Ensure
transaction rollback if there are pending acks during a failover reconnect.
Reliably tracking pending acks to eusure possible redelivery is too complex
in th
https://issues.apache.org/jira/browse/AMQ-5854 - fix and test. Ensure transaction rollback if there are pending acks during a failover reconnect. Reliably tracking pending acks to eusure possible redelivery is too complex in the context of acks getting dropped by failover or ignored by the subscription, in addition to being sent async. Couple that with multiple consumers on the same connection and the locking of message delivery; only safe course is to ensure rollback outcome.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/8d982479
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/8d982479
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/8d982479
Branch: refs/heads/master
Commit: 8d982479e9a5579fc3f6da04109a1b3ef69431eb
Parents: f6e1054
Author: gtully <ga...@gmail.com>
Authored: Mon Sep 28 14:20:19 2015 +0100
Committer: gtully <ga...@gmail.com>
Committed: Mon Sep 28 14:29:57 2015 +0100
----------------------------------------------------------------------
.../activemq/ActiveMQMessageConsumer.java | 6 +
.../org/apache/activemq/TransactionContext.java | 27 ++
.../failover/FailoverTransactionTest.java | 10 +-
.../failover/FailoverTxSlowAckTest.java | 259 +++++++++++++++++++
4 files changed, 300 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/8d982479/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
----------------------------------------------------------------------
diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
index a518a0b..9ccd8e6 100755
--- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
+++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
@@ -743,6 +743,12 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC
inProgressClearRequiredFlag.incrementAndGet();
// deal with delivered messages async to avoid lock contention with in progress acks
clearDeliveredList = true;
+ // force a rollback if we will be acking in a transaction after/during failover
+ // bc acks are async they may not get there reliably on reconnect and the consumer
+ // may not be aware of the reconnect in a timely fashion if in onMessage
+ if (!deliveredMessages.isEmpty() && session.getTransactionContext().isInTransaction()) {
+ session.getTransactionContext().setRollbackOnly(true);
+ }
}
void clearMessagesInProgress() {
http://git-wip-us.apache.org/repos/asf/activemq/blob/8d982479/activemq-client/src/main/java/org/apache/activemq/TransactionContext.java
----------------------------------------------------------------------
diff --git a/activemq-client/src/main/java/org/apache/activemq/TransactionContext.java b/activemq-client/src/main/java/org/apache/activemq/TransactionContext.java
index e9070b3..0925863 100755
--- a/activemq-client/src/main/java/org/apache/activemq/TransactionContext.java
+++ b/activemq-client/src/main/java/org/apache/activemq/TransactionContext.java
@@ -82,6 +82,7 @@ public class TransactionContext implements XAResource {
private TransactionId transactionId;
private LocalTransactionEventListener localTransactionEventListener;
private int beforeEndIndex;
+ private volatile boolean rollbackOnly;
// for RAR recovery
public TransactionContext() {
@@ -111,6 +112,10 @@ public class TransactionContext implements XAResource {
return false;
}
+ public void setRollbackOnly(boolean val) {
+ rollbackOnly = val;
+ }
+
public boolean isInLocalTransaction() {
return transactionId != null && transactionId.isLocalTransaction();
}
@@ -236,6 +241,7 @@ public class TransactionContext implements XAResource {
if (transactionId == null) {
synchronizations = null;
beforeEndIndex = 0;
+ setRollbackOnly(false);
this.transactionId = new LocalTransactionId(getConnectionId(), localTransactionIdGenerator.getNextSequenceId());
TransactionInfo info = new TransactionInfo(getConnectionId(), transactionId, TransactionInfo.BEGIN);
this.connection.ensureConnectionInfoSent();
@@ -307,6 +313,16 @@ public class TransactionContext implements XAResource {
throw e;
}
+ if (rollbackOnly) {
+ final String message = "Commit of " + transactionId + " failed due to rollback only request; typically due to failover with pending acks";
+ try {
+ rollback();
+ } finally {
+ LOG.warn(message);
+ throw new TransactionRolledBackException(message);
+ }
+ }
+
// Only send commit if the transaction was started.
if (transactionId != null) {
LOG.debug("Commit: {} syncCount: {}",
@@ -364,6 +380,7 @@ public class TransactionContext implements XAResource {
// associate
synchronizations = null;
beforeEndIndex = 0;
+ setRollbackOnly(false);
setXid(xid);
}
@@ -441,6 +458,11 @@ public class TransactionContext implements XAResource {
x = new XATransactionId(xid);
}
+ if (rollbackOnly) {
+ LOG.warn("prepare of: " + x + " failed because it was marked rollback only; typically due to failover with pending acks");
+ throw new XAException(XAException.XA_RBINTEGRITY);
+ }
+
try {
TransactionInfo info = new TransactionInfo(getConnectionId(), x, TransactionInfo.PREPARE);
@@ -538,6 +560,11 @@ public class TransactionContext implements XAResource {
x = new XATransactionId(xid);
}
+ if (rollbackOnly) {
+ LOG.warn("commit of: " + x + " failed because it was marked rollback only; typically due to failover with pending acks");
+ throw new XAException(XAException.XA_RBINTEGRITY);
+ }
+
try {
this.connection.checkClosedOrFailed();
this.connection.ensureConnectionInfoSent();
http://git-wip-us.apache.org/repos/asf/activemq/blob/8d982479/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
index 9b41713..1f5ac7d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
@@ -1081,15 +1081,20 @@ public class FailoverTransactionTest extends TestSupport {
broker.start();
final CountDownLatch commitDone = new CountDownLatch(1);
+ final CountDownLatch gotException = new CountDownLatch(1);
// will block pending re-deliveries
Executors.newSingleThreadExecutor().execute(new Runnable() {
public void run() {
LOG.info("doing async commit...");
try {
consumerSession.commit();
- commitDone.countDown();
} catch (JMSException ignored) {
+ ignored.printStackTrace();
+ gotException.countDown();
+ } finally {
+ commitDone.countDown();
}
+
}
});
@@ -1098,8 +1103,9 @@ public class FailoverTransactionTest extends TestSupport {
broker.start();
assertTrue("commit was successful", commitDone.await(30, TimeUnit.SECONDS));
+ assertTrue("got exception on commit", gotException.await(30, TimeUnit.SECONDS));
- assertNull("should not get committed message", consumer.receive(5000));
+ assertNotNull("should get failed committed message", consumer.receive(5000));
connection.close();
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/8d982479/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTxSlowAckTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTxSlowAckTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTxSlowAckTest.java
new file mode 100644
index 0000000..1bbd0d8
--- /dev/null
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTxSlowAckTest.java
@@ -0,0 +1,259 @@
+/**
+ * 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.transport.failover;
+
+import java.util.concurrent.CountDownLatch;
+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 javax.jms.DeliveryMode;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ActiveMQSession;
+import org.apache.activemq.broker.BrokerPlugin;
+import org.apache.activemq.broker.BrokerPluginSupport;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.ProducerBrokerExchange;
+import org.apache.activemq.broker.region.policy.PolicyEntry;
+import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.transaction.Synchronization;
+import org.apache.activemq.util.Wait;
+import org.junit.After;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+import static org.junit.Assert.*;
+
+public class FailoverTxSlowAckTest {
+
+ private static final Logger LOG = LoggerFactory.getLogger(FailoverTxSlowAckTest.class);
+ private static final String QUEUE_IN = "IN";
+ private static final String QUEUE_OUT = "OUT";
+
+ private static final String MESSAGE_TEXT = "Test message ";
+ private static final String TRANSPORT_URI = "tcp://localhost:0?transport.useKeepAlive=false&wireFormat.maxInactivityDuration=10000";
+ private String url;
+ final int prefetch = 1;
+ BrokerService broker;
+
+ @After
+ public void stopBroker() throws Exception {
+ if (broker != null) {
+ broker.stop();
+ }
+ }
+
+ public void startBroker(boolean deleteAllMessagesOnStartup) throws Exception {
+ broker = createBroker(deleteAllMessagesOnStartup);
+ broker.start();
+ }
+
+ public BrokerService createBroker(boolean deleteAllMessagesOnStartup) throws Exception {
+ return createBroker(deleteAllMessagesOnStartup, TRANSPORT_URI);
+ }
+
+ public BrokerService createBroker(boolean deleteAllMessagesOnStartup, String bindAddress) throws Exception {
+ broker = new BrokerService();
+ broker.addConnector(bindAddress);
+ broker.setDeleteAllMessagesOnStartup(deleteAllMessagesOnStartup);
+ PolicyMap policyMap = new PolicyMap();
+ PolicyEntry defaultEntry = new PolicyEntry();
+ defaultEntry.setOptimizedDispatch(true);
+ policyMap.setDefaultEntry(defaultEntry);
+ broker.setDestinationPolicy(policyMap);
+
+ url = broker.getTransportConnectors().get(0).getConnectUri().toString();
+
+ return broker;
+ }
+
+ @Test
+ public void testFailoverDuringAckRollsback() throws Exception {
+ broker = createBroker(true);
+
+ final ExecutorService executorService = Executors.newFixedThreadPool(2);
+ broker.setPlugins(new BrokerPlugin[] {
+ new BrokerPluginSupport() {
+ int sendCount = 0;
+ @Override
+ public void send(ProducerBrokerExchange producerExchange, org.apache.activemq.command.Message messageSend) throws Exception {
+ super.send(producerExchange, messageSend);
+ sendCount++;
+ if (sendCount > 1) {
+ // need new thread b/c we have the service write lock
+ executorService.execute(new Runnable() {
+ public void run() {
+ LOG.info("Stopping broker before commit...");
+ try {
+ broker.stop();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ }
+ }}});
+
+ broker.start();
+
+ ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("failover:(" + url + "?useKeepAlive=false&wireFormat.maxInactivityDuration=10000)");
+ cf.setWatchTopicAdvisories(false);
+ cf.setDispatchAsync(false);
+
+ final ActiveMQConnection connection = (ActiveMQConnection) cf.createConnection();
+ connection.start();
+
+ final Session producerSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ final Queue in = producerSession.createQueue(QUEUE_IN + "?consumer.prefetchSize=" + prefetch);
+
+ final Session consumerSession = connection.createSession(true, Session.AUTO_ACKNOWLEDGE);
+ final Queue out = consumerSession.createQueue(QUEUE_OUT);
+ final MessageProducer consumerProducer = consumerSession.createProducer(out);
+
+
+ final CountDownLatch commitDoneLatch = new CountDownLatch(1);
+ final CountDownLatch messagesReceived = new CountDownLatch(1);
+ final AtomicInteger receivedCount = new AtomicInteger();
+
+ final AtomicBoolean gotDisconnect = new AtomicBoolean();
+ final AtomicBoolean gotReconnected = new AtomicBoolean();
+
+ final MessageConsumer testConsumer = consumerSession.createConsumer(in);
+ testConsumer.setMessageListener(new MessageListener() {
+
+ public void onMessage(Message message) {
+ LOG.info("consume one and commit");
+
+ assertNotNull("got message", message);
+ receivedCount.incrementAndGet();
+ messagesReceived.countDown();
+
+
+ try {
+ // ensure message expires broker side so it won't get redelivered
+ TimeUnit.SECONDS.sleep(1);
+
+ consumerProducer.send(message);
+
+ // hack to block the transaction completion
+ // ensure session does not get to send commit message before failover reconnect
+ // if the commit message is in progress during failover we get rollback via the state
+ // tracker
+ ((ActiveMQSession) consumerSession).getTransactionContext().addSynchronization(new Synchronization() {
+
+ @Override
+ public void beforeEnd() throws Exception {
+
+ LOG.info("waiting for failover reconnect");
+
+ gotDisconnect.set(Wait.waitFor(new Wait.Condition() {
+ @Override
+ public boolean isSatisified() throws Exception {
+ return !((ActiveMQSession) consumerSession).getConnection().getTransport().isConnected();
+ }
+ }));
+
+ LOG.info("got disconnect");
+ gotReconnected.set(Wait.waitFor(new Wait.Condition() {
+ @Override
+ public boolean isSatisified() throws Exception {
+ return ((ActiveMQSession) consumerSession).getConnection().getTransport().isConnected();
+ }
+ }));
+
+ LOG.info("got failover reconnect");
+
+ }
+ });
+
+
+ consumerSession.commit();
+ LOG.info("done commit");
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ commitDoneLatch.countDown();
+ }
+ }
+ });
+
+ executorService.execute(new Runnable() {
+ public void run() {
+ LOG.info("producer started");
+ try {
+ produceMessage(producerSession, in, 1);
+ } catch (javax.jms.IllegalStateException SessionClosedExpectedOnShutdown) {
+ } catch (JMSException e) {
+ e.printStackTrace();
+ fail("unexpceted ex on producer: " + e);
+ }
+ LOG.info("producer done");
+ }
+ });
+
+ // will be stopped by the plugin on TX ack
+ broker.waitUntilStopped();
+ broker = createBroker(false, url);
+ broker.start();
+
+ assertTrue("message was recieved ", messagesReceived.await(20, TimeUnit.SECONDS));
+ assertTrue("tx complete through failover", commitDoneLatch.await(20, TimeUnit.SECONDS));
+ assertEquals("one delivery", 1, receivedCount.get());
+
+ assertTrue("got disconnect/reconnect", gotDisconnect.get());
+ assertTrue("got reconnect", gotReconnected.get());
+
+ assertNull("No message produced", receiveMessage(cf, out));
+ }
+
+
+ private Message receiveMessage(ActiveMQConnectionFactory cf,
+ Queue destination) throws Exception {
+ final ActiveMQConnection connection = (ActiveMQConnection) cf.createConnection();
+ connection.start();
+ final Session consumerSession = connection.createSession(true, Session.SESSION_TRANSACTED);
+ final MessageConsumer consumer = consumerSession.createConsumer(destination);
+ Message msg = consumer.receive(4000);
+ consumerSession.commit();
+ connection.close();
+ return msg;
+ }
+
+ private void produceMessage(final Session producerSession, Queue destination, long count)
+ throws JMSException {
+ MessageProducer producer = producerSession.createProducer(destination);
+ for (int i=0; i<count; i++) {
+ TextMessage message = producerSession.createTextMessage(MESSAGE_TEXT + i);
+ // have it expire so it will only be delivered once
+ producer.send(message, DeliveryMode.PERSISTENT, Message.DEFAULT_PRIORITY, 500);
+ }
+ producer.close();
+ }
+}