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 2019/05/31 09:03:06 UTC
[activemq] branch master updated: AMQ-7219 - ActiveMQ replays
journal file on a clean/unclean shutdown with transacted session + Non
persistent Messages
This is an automated email from the ASF dual-hosted git repository.
gtully pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/master by this push:
new bce9793 AMQ-7219 - ActiveMQ replays journal file on a clean/unclean shutdown with transacted session + Non persistent Messages
new f5db964 Merge pull request #363 from alanprot/fix/empty-transaction
bce9793 is described below
commit bce979349ea9be499d1a686582e8638d369251d1
Author: Alan Protasio <al...@gmail.com>
AuthorDate: Wed May 29 18:29:26 2019 -0700
AMQ-7219 - ActiveMQ replays journal file on a clean/unclean shutdown with transacted session + Non persistent Messages
---
.../activemq/store/kahadb/MessageDatabase.java | 2 +
.../activemq/usecases/EmptyTransactionTest.java | 102 +++++++++++++++++++++
2 files changed, 104 insertions(+)
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 9660afc..1a120a2 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
@@ -1397,6 +1397,8 @@ public abstract class MessageDatabase extends ServiceSupport implements BrokerSe
if (before != null) {
before.sequenceAssignedWithIndexLocked(-1);
}
+ // Moving the checkpoint pointer as there is no persistent operations in this transaction to be replayed
+ processLocation(location);
return;
}
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/EmptyTransactionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/EmptyTransactionTest.java
new file mode 100644
index 0000000..e4f6196
--- /dev/null
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/EmptyTransactionTest.java
@@ -0,0 +1,102 @@
+/**
+ * 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 junit.framework.TestCase;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.apache.activemq.store.kahadb.MessageDatabase;
+import org.apache.activemq.util.DefaultTestAppender;
+import org.apache.log4j.spi.LoggingEvent;
+import org.junit.experimental.theories.Theories;
+
+import javax.jms.Connection;
+import javax.jms.DeliveryMode;
+import javax.jms.JMSException;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class EmptyTransactionTest extends TestCase {
+
+ private static final int CHECKPOINT_INTERVAL = 500;
+ private BrokerService broker;
+
+ public void testEmptyTransactionsCheckpoint() throws Exception {
+
+ AtomicBoolean hadRecovery = new AtomicBoolean(false);
+ DefaultTestAppender appender = new DefaultTestAppender() {
+ @Override
+ public void doAppend(LoggingEvent event) {
+ if (event.getMessage().toString().contains("Recovering from the journal @")) {
+ hadRecovery.set(true);
+ }
+ }
+ };
+
+ org.apache.log4j.Logger.getLogger(MessageDatabase.class).addAppender(appender);
+
+ start(true);
+
+ ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost");
+ Connection connection = factory.createConnection();
+ Session session = connection.createSession(true, Session.SESSION_TRANSACTED);
+ MessageProducer producer = session.createProducer(new ActiveMQQueue("QueueName"));
+ producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+
+ sendMessage(session, producer);
+
+ // wait checkpoint
+ // When we create a new consumer a KahaProducerAuditCommand written to the journal files changing the lastUpdate pointer
+ Thread.sleep(CHECKPOINT_INTERVAL * 2);
+
+ for (int i = 0; i < 5; i++) {
+ sendMessage(session, producer);
+ }
+
+ restart();
+
+ assertFalse(hadRecovery.get());
+ }
+
+ private void sendMessage(final Session session, final MessageProducer producer) throws JMSException {
+ TextMessage m = session.createTextMessage("Hi");
+ producer.send(m);
+ session.commit();
+ }
+
+ private void restart() throws Exception {
+ broker.stop();
+ broker.waitUntilStopped();
+ start(false);
+ }
+
+ private void start(final boolean deleteMessages) throws Exception {
+ broker = new BrokerService();
+ KahaDBPersistenceAdapter kahaDB = new KahaDBPersistenceAdapter();
+ kahaDB.setCheckpointInterval(CHECKPOINT_INTERVAL);
+ broker.setPersistenceAdapter(kahaDB);
+ broker.setPersistent(true);
+ broker.setDeleteAllMessagesOnStartup(deleteMessages);
+ broker.start();
+ broker.waitUntilStarted();
+ }
+
+}