Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #3666

This commit is contained in:
Clebert Suconic 2021-08-03 10:15:57 -04:00
parent 0e23e3c50c 8c3384a947
commit 96f399ce21
8 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/QueueField.java
View File

@ -31,7 +31,7 @@ public enum QueueField {
DELIVERING_COUNT("deliveringCount"),
MESSAGES_ADDED("messagesAdded"),
MESSAGES_ACKED("messagesAcked"),
RATE("rate"),
MESSAGES_EXPIRED("messagesExpired"),
ROUTING_TYPE("routingType"),
USER("user"),
AUTO_CREATED("autoCreated"),

6
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/QueueView.java
View File

@ -49,7 +49,6 @@ public class QueueView extends ActiveMQAbstractView<QueueControl> {
.add(QueueField.NAME.getName(), toString(queue.getName()))
.add(QueueField.ADDRESS.getName(), toString(queue.getAddress()))
.add(QueueField.FILTER.getName(), toString(queue.getFilter()))
.add(QueueField.RATE.getName(), toString(q.getRate()))
.add(QueueField.DURABLE.getName(), toString(queue.isDurable()))
.add(QueueField.PAUSED.getName(), toString(q.isPaused()))
.add(QueueField.TEMPORARY.getName(), toString(queue.isTemporary()))
@ -62,6 +61,7 @@ public class QueueView extends ActiveMQAbstractView<QueueControl> {
.add(QueueField.MESSAGES_ADDED.getName(), toString(queue.getMessagesAdded()))
.add(QueueField.MESSAGE_COUNT.getName(), toString(queue.getMessageCount()))
.add(QueueField.MESSAGES_ACKED.getName(), toString(queue.getMessagesAcknowledged()))
.add(QueueField.MESSAGES_EXPIRED.getName(), toString(queue.getMessagesExpired()))
.add(QueueField.DELIVERING_COUNT.getName(), toString(queue.getDeliveringCount()))
.add(QueueField.MESSAGES_KILLED.getName(), toString(queue.getMessagesKilled()))
.add(QueueField.DIRECT_DELIVER.getName(), toString(q.isDirectDeliver()))
@ -95,8 +95,6 @@ public class QueueView extends ActiveMQAbstractView<QueueControl> {
return queue.getAddress();
case FILTER:
return queue.getFilter();
case RATE:
return q.getRate();
case DURABLE:
return queue.isDurable();
case PAUSED:
@ -121,6 +119,8 @@ public class QueueView extends ActiveMQAbstractView<QueueControl> {
return queue.getMessageCount();
case MESSAGES_ACKED:
return queue.getMessagesAcknowledged();
case MESSAGES_EXPIRED:
return queue.getMessagesExpired();
case DELIVERING_COUNT:
return queue.getDeliveringCount();
case MESSAGES_KILLED:

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/QueueFilterPredicate.java
View File

@ -68,7 +68,7 @@ public class QueueFilterPredicate extends ActiveMQFilterPredicate<QueueControl>
return matches(queue.getMessagesAdded());
case MESSAGES_ACKED:
return matches(queue.getMessagesAcknowledged());
case RATE:
case MESSAGES_EXPIRED:
return matches(queue.getMessagesExpired());
case ROUTING_TYPE:
return matches(queue.getRoutingType());

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
View File

@ -486,8 +486,6 @@ public interface Queue extends Bindable,CriticalComponent {
void postAcknowledge(MessageReference ref, AckReason reason);
float getRate();
/**
* @return the user associated with this queue
*/

3
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
View File

@ -4033,8 +4033,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
messagesKilled.set(0);
}
@Override
public float getRate() {
private float getRate() {
long locaMessageAdded = getMessagesAdded();
float timeSlice = ((System.currentTimeMillis() - queueRateCheckTime.getAndSet(System.currentTimeMillis())) / 1000.0f);
if (timeSlice == 0) {

5
artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
View File

@ -1631,11 +1631,6 @@ public class ScheduledDeliveryHandlerTest extends Assert {
}
@Override
public float getRate() {
return 0.0f;
}
@Override
public SimpleString getUser() {
return null;

5
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
View File

@ -962,11 +962,6 @@ public class FakeQueue extends CriticalComponentImpl implements Queue {
public void postAcknowledge(MessageReference ref, AckReason reason) {
}
@Override
public float getRate() {
return 0.0f;
}
@Override
public SimpleString getUser() {
return null;

8
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java
View File

@ -16,6 +16,7 @@
*/
package org.apache.activemq.artemis.tests.unit.core.server.impl;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
@ -210,7 +211,7 @@ public class QueueImplTest extends ActiveMQTestBase {
}
@Test
public void testRate() throws InterruptedException {
public void testRate() throws Exception {
QueueImpl queue = getTemporaryQueue();
final int numMessages = 10;
@ -223,7 +224,10 @@ public class QueueImplTest extends ActiveMQTestBase {
Thread.sleep(1000);
float rate = queue.getRate();
Method getRate = QueueImpl.class.getDeclaredMethod("getRate", null);
getRate.setAccessible(true);
float rate = (float) getRate.invoke(queue, null);
Assert.assertTrue(rate <= 10.0f);
log.debug("Rate: " + rate);
}