AMQ-7071 - Mark previously dispatched messages as redelivered if

connection for durable topic subscription is improperly closed leading
to a lastDeliveredSequenceId as unknown

(cherry picked from commit 3ac3a420a1)

activemq-broker/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java

@@ -40,6 +40,7 @@ import org.apache.activemq.command.Message;
 import org.apache.activemq.command.MessageAck;
 import org.apache.activemq.command.MessageDispatch;
 import org.apache.activemq.command.MessageId;
+import org.apache.activemq.command.RemoveInfo;
 import org.apache.activemq.store.TopicMessageStore;
 import org.apache.activemq.usage.SystemUsage;
 import org.apache.activemq.usage.Usage;
@@ -217,7 +218,8 @@ public class DurableTopicSubscription extends PrefetchSubscription implements Us
 
                 for (final MessageReference node : dispatched) {
                     // Mark the dispatched messages as redelivered for next time.
-                    if (lastDeliveredSequenceId == 0 || (lastDeliveredSequenceId > 0 && node.getMessageId().getBrokerSequenceId() <= lastDeliveredSequenceId)) {
+                    if (lastDeliveredSequenceId == RemoveInfo.LAST_DELIVERED_UNKNOWN || lastDeliveredSequenceId == 0 ||
+                            (lastDeliveredSequenceId > 0 && node.getMessageId().getBrokerSequenceId() <= lastDeliveredSequenceId)) {
                         Integer count = redeliveredMessages.get(node.getMessageId());
                         if (count != null) {
                             redeliveredMessages.put(node.getMessageId(), Integer.valueOf(count.intValue() + 1));

activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableRedeliveryTest.java

@@ -0,0 +1,132 @@
+/**
+ * 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 static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.Topic;
+
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.TransportConnection;
+import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.broker.region.policy.PolicyEntry;
+import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.util.Wait;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Test for AMQ-7071
+ * Test to show prefetched messages will be marked as redelivered if connection terminated improperly
+ * and the lastDeliveredSequenceId is unknown
+ */
+public class DurableRedeliveryTest {
+
+    static final Logger LOG = LoggerFactory.getLogger(DurableRedeliveryTest.class);
+    BrokerService broker = null;
+    String topicName = "testTopic";
+
+    @Before
+    public void setUp() throws Exception {
+        broker = new BrokerService();
+        configureBroker(broker);
+        broker.start();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        broker.stop();
+    }
+
+    protected void configureBroker(BrokerService broker) throws Exception {
+        PolicyMap policyMap = new PolicyMap();
+        PolicyEntry policy = new PolicyEntry();
+        policyMap.setDefaultEntry(policy);
+        broker.setDestinationPolicy(policyMap);
+        broker.setPersistent(false);
+        broker.addConnector("tcp://0.0.0.0:0");
+    }
+
+    @Test
+    public void testRedeliveryFlagAfterConnectionKill() throws Exception {
+
+        ConnectionFactory connectionFactory = new ActiveMQConnectionFactory(
+                broker.getTransportConnectors().get(0).getPublishableConnectString());
+        ActiveMQConnection producerConnection = (ActiveMQConnection) connectionFactory.createConnection();
+        ActiveMQConnection durableConnection = (ActiveMQConnection) connectionFactory.createConnection();
+        durableConnection.setClientID("clientId");
+        producerConnection.start();
+        durableConnection.start();
+
+        Session session = durableConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        Topic topic = session.createTopic(topicName);
+        MessageConsumer consumer = session.createDurableSubscriber(topic, "sub1");
+
+        populateDestination(1, topic, producerConnection);
+        producerConnection.close();
+        Wait.waitFor(() -> broker.getBroker().getClients().length == 1);
+
+        //Close the connection on the broker side (not the client) so the delivered status of the
+        //prefetched message will be unknown which should now trigger the previously dispatched message
+        //to be marked as redelivered
+        TransportConnector connector = broker.getTransportConnectors().get(0);
+        TransportConnection connection = connector.getConnections().stream().findFirst().get();
+        connection.stop();
+        Wait.waitFor(() -> broker.getBroker().getClients().length == 0);
+
+        //Reconnect and consume the message
+        durableConnection = (ActiveMQConnection) connectionFactory.createConnection();
+        durableConnection.setClientID("clientId");
+        durableConnection.start();
+
+        session = durableConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        topic = session.createTopic(topicName);
+        consumer = session.createDurableSubscriber(topic, "sub1");
+
+        Message msg = consumer.receive(2000);
+        LOG.info("got: " + msg);
+        assertNotNull("got the message", msg);
+        assertTrue("got the message has redelivered flag", msg.getJMSRedelivered());
+
+        producerConnection.close();
+        durableConnection.close();
+    }
+
+    private void populateDestination(final int nbMessages, final Destination destination, javax.jms.Connection connection) throws JMSException {
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        MessageProducer producer = session.createProducer(destination);
+        for (int i = 1; i <= nbMessages; i++) {
+            producer.send(session.createTextMessage("test: " + i));
+        }
+        producer.close();
+        session.close();
+    }
+
+}