You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/07/27 20:49:41 UTC
[2/2] activemq-artemis git commit: ARTEMIS-647 track 'killed' msg
count on queue
ARTEMIS-647 track 'killed' msg count on queue
A 'killed' message is one that has been sent to a dead-letter address
or otherwise removed from the queue due to exceeding the max delivery
attempts.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3914f1aa
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3914f1aa
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3914f1aa
Branch: refs/heads/master
Commit: 3914f1aa8bb046f2a9b473bd387319cd80e8c30c
Parents: 53c56ef
Author: jbertram <jb...@apache.org>
Authored: Wed Jul 27 10:04:37 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jul 27 16:44:59 2016 -0400
----------------------------------------------------------------------
.../api/core/management/QueueControl.java | 12 +++++
.../api/jms/management/JMSQueueControl.java | 6 +++
.../management/impl/JMSQueueControlImpl.java | 5 ++
.../core/management/impl/QueueControlImpl.java | 27 ++++++++++
.../core/paging/cursor/PagedReferenceImpl.java | 10 +++-
.../artemis/core/server/MessageReference.java | 3 ++
.../activemq/artemis/core/server/Queue.java | 9 ++++
.../artemis/core/server/impl/AckReason.java | 22 ++++++++
.../core/server/impl/LastValueQueue.java | 5 ++
.../core/server/impl/MessageReferenceImpl.java | 9 +++-
.../artemis/core/server/impl/QueueImpl.java | 55 +++++++++++++-------
.../impl/ScheduledDeliveryHandlerTest.java | 20 +++++++
.../management/JMSQueueControlUsingJMSTest.java | 5 ++
.../management/QueueControlTest.java | 45 ++++++++++++++++
.../management/QueueControlUsingCoreTest.java | 10 ++++
.../unit/core/postoffice/impl/FakeQueue.java | 25 +++++++++
16 files changed, 244 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3914f1aa/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
index 3492892..60957ad 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
@@ -105,6 +105,12 @@ public interface QueueControl {
long getMessagesExpired();
/**
+ * Returns the number of messages removed from this queue since it was created due to exceeding the max delivery attempts.
+ */
+ @Attribute(desc = "number of messages removed from this queue since it was created due to exceeding the max delivery attempts")
+ long getMessagesKilled();
+
+ /**
* Returns the first message on the queue as JSON
*/
@Attribute(desc = "first message on the queue as JSON")
@@ -447,6 +453,12 @@ public interface QueueControl {
void resetMessagesExpired() throws Exception;
/**
+ * Resets the MessagesExpired property
+ */
+ @Operation(desc = "Resets the MessagesKilled property", impact = MBeanOperationInfo.ACTION)
+ void resetMessagesKilled() throws Exception;
+
+ /**
* it will flush one cycle on internal executors, so you would be sure that any pending tasks are done before you call
* any other measure.
* It is useful if you need the exact number of counts on a message
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3914f1aa/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSQueueControl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSQueueControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSQueueControl.java
index c13e3b9..3001ec5 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSQueueControl.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSQueueControl.java
@@ -62,6 +62,12 @@ public interface JMSQueueControl extends DestinationControl {
long getMessagesExpired();
/**
+ * Returns the number of messages removed from this queue since it was created due to exceeding the max delivery attempts.
+ */
+ @Attribute(desc = "number of messages removed from this queue since it was created due to exceeding the max delivery attempts")
+ long getMessagesKilled();
+
+ /**
* returns the selector for the queue
*/
@Attribute(desc = "selector for the queue")
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3914f1aa/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java
index b037d72..0cb991a 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java
@@ -130,6 +130,11 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
}
@Override
+ public long getMessagesKilled() {
+ return coreQueueControl.getMessagesKilled();
+ }
+
+ @Override
public int getConsumerCount() {
return coreQueueControl.getConsumerCount();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3914f1aa/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
index 8f1d6e6..04baf1b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
@@ -270,6 +270,19 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
}
@Override
+ public long getMessagesKilled() {
+ checkStarted();
+
+ clearIO();
+ try {
+ return queue.getMessagesKilled();
+ }
+ finally {
+ blockOnIO();
+ }
+ }
+
+ @Override
public long getID() {
checkStarted();
@@ -1038,6 +1051,20 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
}
+ @Override
+ public void resetMessagesKilled() throws Exception {
+ checkStarted();
+
+ clearIO();
+ try {
+ queue.resetMessagesKilled();
+ }
+ finally {
+ blockOnIO();
+ }
+
+ }
+
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3914f1aa/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java
index 33e1086..a447569 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java
@@ -25,6 +25,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
import org.apache.activemq.artemis.core.server.MessageReference;
import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.AckReason;
import org.apache.activemq.artemis.core.transaction.Transaction;
import org.jboss.logging.Logger;
@@ -215,11 +216,16 @@ public class PagedReferenceImpl implements PagedReference {
@Override
public void acknowledge(Transaction tx) throws Exception {
+ acknowledge(tx, AckReason.NORMAL);
+ }
+
+ @Override
+ public void acknowledge(Transaction tx, AckReason reason) throws Exception {
if (tx == null) {
- getQueue().acknowledge(this);
+ getQueue().acknowledge(this, reason);
}
else {
- getQueue().acknowledge(tx, this);
+ getQueue().acknowledge(tx, this, reason);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3914f1aa/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/MessageReference.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/MessageReference.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/MessageReference.java
index b1e0dde..8c80eb0 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/MessageReference.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/MessageReference.java
@@ -16,6 +16,7 @@
*/
package org.apache.activemq.artemis.core.server;
+import org.apache.activemq.artemis.core.server.impl.AckReason;
import org.apache.activemq.artemis.core.transaction.Transaction;
/**
@@ -73,6 +74,8 @@ public interface MessageReference {
void acknowledge(Transaction tx) throws Exception;
+ void acknowledge(Transaction tx, AckReason reason) throws Exception;
+
void setConsumerId(Long consumerID);
Long getConsumerId();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3914f1aa/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
index 6645d36..a9a87c3 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
@@ -25,6 +25,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.filter.Filter;
import org.apache.activemq.artemis.core.paging.cursor.PageSubscription;
+import org.apache.activemq.artemis.core.server.impl.AckReason;
import org.apache.activemq.artemis.core.transaction.Transaction;
import org.apache.activemq.artemis.utils.LinkedListIterator;
import org.apache.activemq.artemis.utils.ReferenceCounter;
@@ -74,8 +75,12 @@ public interface Queue extends Bindable {
void acknowledge(MessageReference ref) throws Exception;
+ void acknowledge(final MessageReference ref, AckReason reason) throws Exception;
+
void acknowledge(Transaction tx, MessageReference ref) throws Exception;
+ void acknowledge(final Transaction tx, final MessageReference ref, AckReason reason) throws Exception;
+
void reacknowledge(Transaction tx, MessageReference ref) throws Exception;
void cancel(Transaction tx, MessageReference ref);
@@ -123,6 +128,8 @@ public interface Queue extends Bindable {
long getMessagesExpired();
+ long getMessagesKilled();
+
MessageReference removeReferenceWithID(long id) throws Exception;
MessageReference getReference(long id) throws ActiveMQException;
@@ -238,6 +245,8 @@ public interface Queue extends Bindable {
void resetMessagesExpired();
+ void resetMessagesKilled();
+
void incrementMesssagesAdded();
/**
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3914f1aa/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AckReason.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AckReason.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AckReason.java
new file mode 100644
index 0000000..06b3d85
--- /dev/null
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AckReason.java
@@ -0,0 +1,22 @@
+/*
+ * 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.core.server.impl;
+
+public enum AckReason {
+ KILLED, EXPIRED, NORMAL
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3914f1aa/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java
index 932c260..906a43e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java
@@ -263,6 +263,11 @@ public class LastValueQueue extends QueueImpl {
}
@Override
+ public void acknowledge(Transaction tx, AckReason reason) throws Exception {
+ ref.acknowledge(tx, reason);
+ }
+
+ @Override
public void setPersistedCount(int count) {
ref.setPersistedCount(count);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3914f1aa/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
index c5f8485..866265e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
@@ -192,11 +192,16 @@ public class MessageReferenceImpl implements MessageReference {
@Override
public void acknowledge(Transaction tx) throws Exception {
+ acknowledge(tx, AckReason.NORMAL);
+ }
+
+ @Override
+ public void acknowledge(Transaction tx, AckReason reason) throws Exception {
if (tx == null) {
- getQueue().acknowledge(this);
+ getQueue().acknowledge(this, reason);
}
else {
- getQueue().acknowledge(tx, this);
+ getQueue().acknowledge(tx, this, reason);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3914f1aa/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 724da5b..b8d917a 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
@@ -169,6 +169,8 @@ public class QueueImpl implements Queue {
private long messagesExpired;
+ private long messagesKilled;
+
protected final AtomicInteger deliveringCount = new AtomicInteger(0);
private boolean paused;
@@ -964,10 +966,11 @@ public class QueueImpl implements Queue {
@Override
public void acknowledge(final MessageReference ref) throws Exception {
- acknowledge(ref, OperationType.NORMAL);
+ acknowledge(ref, AckReason.NORMAL);
}
- private void acknowledge(final MessageReference ref, OperationType type) throws Exception {
+ @Override
+ public void acknowledge(final MessageReference ref, AckReason reason) throws Exception {
if (ref.isPaged()) {
pageSubscription.ack((PagedReference) ref);
postAcknowledge(ref);
@@ -983,9 +986,12 @@ public class QueueImpl implements Queue {
postAcknowledge(ref);
}
- if (type == OperationType.EXPIRED) {
+ if (reason == AckReason.EXPIRED) {
messagesExpired++;
}
+ else if (reason == AckReason.KILLED) {
+ messagesKilled++;
+ }
else {
messagesAcknowledged++;
}
@@ -994,10 +1000,11 @@ public class QueueImpl implements Queue {
@Override
public void acknowledge(final Transaction tx, final MessageReference ref) throws Exception {
- acknowledge(tx, ref, OperationType.NORMAL);
+ acknowledge(tx, ref, AckReason.NORMAL);
}
- private void acknowledge(final Transaction tx, final MessageReference ref, OperationType type) throws Exception {
+ @Override
+ public void acknowledge(final Transaction tx, final MessageReference ref, AckReason reason) throws Exception {
if (ref.isPaged()) {
pageSubscription.ackTx(tx, (PagedReference) ref);
@@ -1017,9 +1024,12 @@ public class QueueImpl implements Queue {
getRefsOperation(tx).addAck(ref);
}
- if (type == OperationType.EXPIRED) {
+ if (reason == AckReason.EXPIRED) {
messagesExpired++;
}
+ else if (reason == AckReason.KILLED) {
+ messagesKilled++;
+ }
else {
messagesAcknowledged++;
}
@@ -1095,13 +1105,13 @@ public class QueueImpl implements Queue {
if (logger.isTraceEnabled()) {
logger.trace("moving expired reference " + ref + " to address = " + expiryAddress + " from queue=" + this.getName());
}
- move(null, expiryAddress, ref, true, false, OperationType.EXPIRED);
+ move(null, expiryAddress, ref, false, AckReason.EXPIRED);
}
else {
if (logger.isTraceEnabled()) {
logger.trace("expiry is null, just acking expired message for reference " + ref + " from queue=" + this.getName());
}
- acknowledge(ref, OperationType.EXPIRED);
+ acknowledge(ref, AckReason.EXPIRED);
}
}
@@ -1153,6 +1163,11 @@ public class QueueImpl implements Queue {
}
@Override
+ public long getMessagesKilled() {
+ return messagesKilled;
+ }
+
+ @Override
public int deleteAllReferences() throws Exception {
return deleteAllReferences(DEFAULT_FLUSH_LIMIT);
}
@@ -1533,7 +1548,7 @@ public class QueueImpl implements Queue {
refRemoved(ref);
incDelivering();
try {
- move(null, toAddress, ref, false, rejectDuplicate, OperationType.NORMAL);
+ move(null, toAddress, ref, rejectDuplicate, AckReason.NORMAL);
}
catch (Exception e) {
decDelivering();
@@ -2374,26 +2389,25 @@ public class QueueImpl implements Queue {
if (bindingList.getBindings().isEmpty()) {
ActiveMQServerLogger.LOGGER.messageExceededMaxDelivery(ref, deadLetterAddress);
- ref.acknowledge(tx);
+ ref.acknowledge(tx, AckReason.KILLED);
}
else {
ActiveMQServerLogger.LOGGER.messageExceededMaxDeliverySendtoDLA(ref, deadLetterAddress, name);
- move(tx, deadLetterAddress, ref, false, false, OperationType.NORMAL);
+ move(tx, deadLetterAddress, ref, false, AckReason.KILLED);
}
}
else {
ActiveMQServerLogger.LOGGER.messageExceededMaxDeliveryNoDLA(name);
- ref.acknowledge(tx);
+ ref.acknowledge(tx, AckReason.KILLED);
}
}
private void move(final Transaction originalTX,
final SimpleString address,
final MessageReference ref,
- final boolean expiry,
final boolean rejectDuplicate,
- final OperationType type) throws Exception {
+ final AckReason reason) throws Exception {
Transaction tx;
if (originalTX != null) {
@@ -2404,13 +2418,13 @@ public class QueueImpl implements Queue {
tx = new TransactionImpl(storageManager);
}
- ServerMessage copyMessage = makeCopy(ref, expiry);
+ ServerMessage copyMessage = makeCopy(ref, reason == AckReason.EXPIRED);
copyMessage.setAddress(address);
postOffice.route(copyMessage, null, tx, false, rejectDuplicate);
- acknowledge(tx, ref, type);
+ acknowledge(tx, ref, reason);
if (originalTX == null) {
tx.commit();
@@ -2665,6 +2679,11 @@ public class QueueImpl implements Queue {
}
@Override
+ public synchronized void resetMessagesKilled() {
+ messagesKilled = 0;
+ }
+
+ @Override
public float getRate() {
float timeSlice = ((System.currentTimeMillis() - queueRateCheckTime.getAndSet(System.currentTimeMillis())) / 1000.0f);
if (timeSlice == 0) {
@@ -3019,9 +3038,5 @@ public class QueueImpl implements Queue {
}
}
}
-
- private enum OperationType {
- EXPIRED, NORMAL
- }
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3914f1aa/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
index 301833e..4e05b3a 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
@@ -957,11 +957,21 @@ public class ScheduledDeliveryHandlerTest extends Assert {
}
@Override
+ public void acknowledge(MessageReference ref, AckReason reason) throws Exception {
+
+ }
+
+ @Override
public void acknowledge(Transaction tx, MessageReference ref) throws Exception {
}
@Override
+ public void acknowledge(Transaction tx, MessageReference ref, AckReason reason) throws Exception {
+
+ }
+
+ @Override
public void reacknowledge(Transaction tx, MessageReference ref) throws Exception {
}
@@ -1052,6 +1062,11 @@ public class ScheduledDeliveryHandlerTest extends Assert {
}
@Override
+ public long getMessagesKilled() {
+ return 0;
+ }
+
+ @Override
public MessageReference removeReferenceWithID(long id) throws Exception {
return null;
}
@@ -1266,6 +1281,11 @@ public class ScheduledDeliveryHandlerTest extends Assert {
}
@Override
+ public void resetMessagesKilled() {
+
+ }
+
+ @Override
public void incrementMesssagesAdded() {
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3914f1aa/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
index 8c14ff2..1443a4f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
@@ -125,6 +125,11 @@ public class JMSQueueControlUsingJMSTest extends JMSQueueControlTest {
}
@Override
+ public long getMessagesKilled() {
+ return ((Number) proxy.retrieveAttributeValue("messagesKilled")).longValue();
+ }
+
+ @Override
public String getDeadLetterAddress() {
return (String) proxy.retrieveAttributeValue("deadLetterAddress");
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3914f1aa/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
index 693b556..95a08a1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
@@ -2024,6 +2024,51 @@ public class QueueControlTest extends ManagementTestBase {
session.deleteQueue(queue);
}
+ @Test
+ public void testResetMessagesKilled() throws Exception {
+ SimpleString address = RandomUtil.randomSimpleString();
+ SimpleString queue = RandomUtil.randomSimpleString();
+
+ session.createQueue(address, queue, null, false);
+
+ QueueControl queueControl = createManagementControl(address, queue);
+ Assert.assertEquals(0, queueControl.getMessagesExpired());
+
+ ClientProducer producer = session.createProducer(address);
+ ClientMessage message = session.createMessage(false);
+ producer.send(message);
+
+ // the message IDs are set on the server
+ Map<String, Object>[] messages = queueControl.listMessages(null);
+ Assert.assertEquals(1, messages.length);
+ long messageID = (Long) messages[0].get("messageID");
+
+ queueControl.sendMessageToDeadLetterAddress(messageID);
+ Assert.assertEquals(1, queueControl.getMessagesKilled());
+
+ message = session.createMessage(false);
+ producer.send(message);
+
+ // send to DLA the old-fashioned way
+ ClientConsumer consumer = session.createConsumer(queue);
+ for (int i = 0; i < server.getAddressSettingsRepository().getMatch(queue.toString()).getMaxDeliveryAttempts(); i++) {
+ message = consumer.receive(500);
+ assertNotNull(message);
+ message.acknowledge();
+ session.rollback();
+ }
+
+ consumer.close();
+
+ Assert.assertEquals(2, queueControl.getMessagesKilled());
+
+ queueControl.resetMessagesKilled();
+
+ Assert.assertEquals(0, queueControl.getMessagesKilled());
+
+ session.deleteQueue(queue);
+ }
+
//make sure notifications are always received no matter whether
//a Queue is created via QueueControl or by JMSServerManager directly.
@Test
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3914f1aa/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlUsingCoreTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlUsingCoreTest.java
index 230941f..b0cc315 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlUsingCoreTest.java
@@ -126,6 +126,11 @@ public class QueueControlUsingCoreTest extends QueueControlTest {
}
@Override
+ public long getMessagesKilled() {
+ return ((Number) proxy.retrieveAttributeValue("messagesKilled")).longValue();
+ }
+
+ @Override
public void resetMessagesAdded() throws Exception {
proxy.invokeOperation("resetMessagesAdded");
}
@@ -141,6 +146,11 @@ public class QueueControlUsingCoreTest extends QueueControlTest {
}
@Override
+ public void resetMessagesKilled() throws Exception {
+ proxy.invokeOperation("resetMessagesKilled");
+ }
+
+ @Override
public String getName() {
return (String) proxy.retrieveAttributeValue("name");
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3914f1aa/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
index 0633bfb..8eae7d6 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
@@ -29,6 +29,7 @@ import org.apache.activemq.artemis.core.server.MessageReference;
import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.core.server.RoutingContext;
import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.AckReason;
import org.apache.activemq.artemis.core.transaction.Transaction;
import org.apache.activemq.artemis.utils.LinkedListIterator;
import org.apache.activemq.artemis.utils.ReferenceCounter;
@@ -158,12 +159,24 @@ public class FakeQueue implements Queue {
}
@Override
+ public void acknowledge(MessageReference ref, AckReason reason) throws Exception {
+ // no-op
+
+ }
+
+ @Override
public void acknowledge(final Transaction tx, final MessageReference ref) throws Exception {
// no-op
}
@Override
+ public void acknowledge(Transaction tx, MessageReference ref, AckReason reason) throws Exception {
+ // no-op
+
+ }
+
+ @Override
public void addConsumer(final Consumer consumer) throws Exception {
// no-op
@@ -318,6 +331,12 @@ public class FakeQueue implements Queue {
}
@Override
+ public long getMessagesKilled() {
+ // no-op
+ return 0;
+ }
+
+ @Override
public void resetMessagesAdded() {
// no-op
@@ -336,6 +355,12 @@ public class FakeQueue implements Queue {
}
@Override
+ public void resetMessagesKilled() {
+ // no-op
+
+ }
+
+ @Override
public void incrementMesssagesAdded() {
}