You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2018/03/05 20:01:08 UTC
[1/3] activemq-artemis git commit: ARTEMIS-1730 fix expiry without
address or bindings
Repository: activemq-artemis
Updated Branches:
refs/heads/master 213515892 -> c009c90cb
ARTEMIS-1730 fix expiry without address or bindings
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/66e81c50
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/66e81c50
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/66e81c50
Branch: refs/heads/master
Commit: 66e81c500a074f59fbdd4688a7c026b9aed9e6ad
Parents: 913d7ec
Author: Ilkka Virolainen <il...@bitwise.fi>
Authored: Fri Mar 2 14:18:40 2018 +0200
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon Mar 5 15:00:07 2018 -0500
----------------------------------------------------------------------
.../org/apache/activemq/artemis/core/server/impl/QueueImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/66e81c50/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index 58f31ea..b9adf33 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -2741,6 +2741,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
if (bindingList.getBindings().isEmpty()) {
ActiveMQServerLogger.LOGGER.errorExpiringReferencesNoBindings(expiryAddress);
+ acknowledge(tx, ref, AckReason.EXPIRED);
} else {
move(expiryAddress, tx, ref, true, true);
}
@@ -2751,7 +2752,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
ActiveMQServerLogger.LOGGER.errorExpiringReferencesNoQueue(name);
}
- acknowledge(tx, ref);
+ acknowledge(tx, ref, AckReason.EXPIRED);
}
}
[3/3] activemq-artemis git commit: This closes #1930
Posted by ta...@apache.org.
This closes #1930
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c009c90c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c009c90c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c009c90c
Branch: refs/heads/master
Commit: c009c90cbe00568c11f06e6fe0e5622723f0a842
Parents: 2135158 66e81c5
Author: Timothy Bish <ta...@gmail.com>
Authored: Mon Mar 5 15:00:54 2018 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon Mar 5 15:00:54 2018 -0500
----------------------------------------------------------------------
.../artemis/core/server/impl/QueueImpl.java | 3 +-
.../server/MessageExpirationTest.java | 109 +++++++++++++++++++
2 files changed, 111 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] activemq-artemis git commit: ARTEMIS-1730 add tests for expiry
issue
Posted by ta...@apache.org.
ARTEMIS-1730 add tests for expiry issue
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/913d7eca
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/913d7eca
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/913d7eca
Branch: refs/heads/master
Commit: 913d7ecac2c67f7df7f2ff55a08f6a23ae2afdcb
Parents: 2135158
Author: Justin Bertram <jb...@apache.org>
Authored: Mon Mar 5 11:39:58 2018 -0600
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon Mar 5 15:00:07 2018 -0500
----------------------------------------------------------------------
.../server/MessageExpirationTest.java | 109 +++++++++++++++++++
1 file changed, 109 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/913d7eca/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/MessageExpirationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/MessageExpirationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/MessageExpirationTest.java
new file mode 100644
index 0000000..1760908
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/MessageExpirationTest.java
@@ -0,0 +1,109 @@
+/*
+ * 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.artemis.tests.integration.server;
+
+import org.apache.activemq.artemis.api.core.RoutingType;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.junit.Wait;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.apache.activemq.artemis.utils.RandomUtil;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class MessageExpirationTest extends ActiveMQTestBase {
+
+ private static final int EXPIRATION = 200;
+
+ private ActiveMQServer server;
+
+ private ClientSession session;
+
+ private ClientSessionFactory sf;
+
+ private ServerLocator locator;
+
+ @Test
+ public void testMessagesExpiredNoBindings() throws Exception {
+ SimpleString address = RandomUtil.randomSimpleString();
+ SimpleString queue = RandomUtil.randomSimpleString();
+ SimpleString expiryAddress = RandomUtil.randomSimpleString();
+
+ AddressSettings addressSettings = new AddressSettings().setExpiryAddress(expiryAddress);
+ server.getAddressSettingsRepository().addMatch(address.toString(), addressSettings);
+
+ session.createQueue(address, RoutingType.MULTICAST, queue, null, true);
+
+ Assert.assertEquals(0, server.locateQueue(queue).getMessagesExpired());
+
+ ClientProducer producer = session.createProducer(address);
+ ClientMessage message = session.createMessage(true);
+ message.setExpiration(System.currentTimeMillis() + EXPIRATION);
+ producer.send(message);
+
+ Assert.assertTrue(Wait.waitFor(() -> server.locateQueue(queue).getMessagesExpired() == 1, 2000, 100));
+
+ assertEquals(0, server.locateQueue(queue).getMessageCount());
+ assertEquals(0, server.locateQueue(queue).getDeliveringCount());
+
+ session.deleteQueue(queue);
+ }
+
+ @Test
+ public void testMessagesExpiredNoExpiryAddress() throws Exception {
+ SimpleString address = RandomUtil.randomSimpleString();
+ SimpleString queue = RandomUtil.randomSimpleString();
+
+ session.createQueue(address, RoutingType.MULTICAST, queue, null, true);
+
+ Assert.assertEquals(0, server.locateQueue(queue).getMessagesExpired());
+
+ ClientProducer producer = session.createProducer(address);
+ ClientMessage message = session.createMessage(true);
+ message.setExpiration(System.currentTimeMillis() + EXPIRATION);
+ producer.send(message);
+
+ Assert.assertTrue(Wait.waitFor(() -> server.locateQueue(queue).getMessagesExpired() == 1, 2000, 100));
+
+ assertEquals(0, server.locateQueue(queue).getMessageCount());
+ assertEquals(0, server.locateQueue(queue).getDeliveringCount());
+
+ session.deleteQueue(queue);
+ }
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+
+ server = createServer(false);
+
+ server.getConfiguration().setMessageExpiryScanPeriod(500);
+
+ server.start();
+ locator = createInVMNonHALocator();
+ sf = createSessionFactory(locator);
+ session = addClientSession(sf.createSession(false, true, true));
+ }
+}