This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 8a9f326 ARTEMIS-3647 - OpenWire, remove rolledbackMessageRef on Ack
new 7cc66a8 This closes #3927
8a9f326 is described below
commit 8a9f326b25e5feaedcb1393f8d2a07a9d9432c48
Author: AntonRoskvist <[email protected]>
AuthorDate: Wed Feb 9 14:13:59 2022 +0100
ARTEMIS-3647 - OpenWire, remove rolledbackMessageRef on Ack
---
.../core/protocol/openwire/amq/AMQConsumer.java | 4 +-
.../protocol/openwire/amq/AMQConsumerAccessor.java | 28 ++++++++++++
.../openwire/amq/RedeliveryPolicyTest.java | 51 ++++++++++++++++++++++
3 files changed, 82 insertions(+), 1 deletion(-)
diff --git
a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
index 76a18c3..ee5d0cb 100644
---
a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
+++
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
@@ -113,7 +113,7 @@ public class AMQConsumer {
return rolledbackMessageRefs;
}
- private Set<MessageReference> getRolledbackMessageRefs() {
+ protected Set<MessageReference> getRolledbackMessageRefs() {
return this.rolledbackMessageRefs;
}
@@ -343,6 +343,7 @@ public class AMQConsumer {
if (ack.isIndividualAck() || ack.isStandardAck()) {
for (MessageReference ref : ackList) {
ref.acknowledge(transaction, serverConsumer);
+ removeRolledback(ref);
}
} else if (ack.isPoisonAck()) {
for (MessageReference ref : ackList) {
@@ -353,6 +354,7 @@ public class AMQConsumer {
((QueueImpl) ref.getQueue()).incDelivering(ref);
}
ref.getQueue().sendToDeadLetterAddress(transaction, ref);
+ removeRolledback(ref);
}
}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumerAccessor.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumerAccessor.java
new file mode 100644
index 0000000..74f313f
--- /dev/null
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumerAccessor.java
@@ -0,0 +1,28 @@
+/**
+ * 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.artemis.core.protocol.openwire.amq;
+
+import org.apache.activemq.artemis.core.server.MessageReference;
+
+import java.util.Set;
+
+public class AMQConsumerAccessor {
+ public static Set<MessageReference> getRolledbackMessageRefs(AMQConsumer
amqConsumer) {
+ return amqConsumer.getRolledbackMessageRefs();
+ }
+}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/RedeliveryPolicyTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/RedeliveryPolicyTest.java
index 71ceed4..cbdda46 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/RedeliveryPolicyTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/RedeliveryPolicyTest.java
@@ -29,6 +29,10 @@ import java.util.concurrent.TimeUnit;
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.RedeliveryPolicy;
+import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQConsumer;
+import
org.apache.activemq.artemis.core.protocol.openwire.amq.AMQConsumerAccessor;
+import org.apache.activemq.artemis.core.server.ServerConsumer;
+import org.apache.activemq.artemis.core.server.ServerSession;
import org.apache.activemq.artemis.api.core.management.QueueControl;
import org.apache.activemq.artemis.api.core.management.ResourceNames;
import
org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
@@ -479,6 +483,53 @@ public class RedeliveryPolicyTest extends
BasicOpenWireTest {
}
+ /**
+ * @throws Exception
+ */
+ @Test
+ public void testRedeliveryRefCleanup() throws Exception {
+
+ // Receive a message with the JMS API
+ RedeliveryPolicy policy = connection.getRedeliveryPolicy();
+ policy.setUseExponentialBackOff(false);
+ policy.setMaximumRedeliveries(-1);
+ policy.setRedeliveryDelay(50);
+
+ connection.start();
+ Session pSession = connection.createSession(true,
Session.AUTO_ACKNOWLEDGE);
+ Session cSession = connection.createSession(true,
Session.AUTO_ACKNOWLEDGE);
+ ActiveMQQueue destination = new ActiveMQQueue("TEST");
+ this.makeSureCoreQueueExist("TEST");
+ MessageProducer producer = pSession.createProducer(destination);
+ MessageConsumer consumer = cSession.createConsumer(destination);
+
+ TextMessage m;
+
+ for (int i = 0; i < 5; ++i) {
+ producer.send(pSession.createTextMessage("MessageText"));
+ pSession.commit();
+ m = (TextMessage) consumer.receive(2000);
+ assertNotNull(m);
+ cSession.rollback();
+ m = (TextMessage) consumer.receive(2000);
+ assertNotNull(m);
+ cSession.commit();
+ }
+
+ ServerConsumer serverConsumer = null;
+ for (ServerSession session : server.getSessions()) {
+ for (ServerConsumer sessionConsumer : session.getServerConsumers()) {
+ if (sessionConsumer.getQueue().getName().toString() == "TEST") {
+ serverConsumer = sessionConsumer;
+ }
+ }
+ }
+
+ AMQConsumer amqConsumer = (AMQConsumer) serverConsumer.getProtocolData();
+
assertTrue(AMQConsumerAccessor.getRolledbackMessageRefs(amqConsumer).isEmpty());
+
+ }
+
@Test
public void testInitialRedeliveryDelayZero() throws Exception {
// Receive a message with the JMS API
