You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2017/10/06 15:21:11 UTC
activemq git commit: [AMQ-6829] add inflight count to dstat queue
output
Repository: activemq
Updated Branches:
refs/heads/master 25ef84a3a -> 044699c00
[AMQ-6829] add inflight count to dstat queue output
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/044699c0
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/044699c0
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/044699c0
Branch: refs/heads/master
Commit: 044699c00cbe65c3930194c6937b12b62f502177
Parents: 25ef84a
Author: gtully <ga...@gmail.com>
Authored: Fri Oct 6 16:21:15 2017 +0100
Committer: gtully <ga...@gmail.com>
Committed: Fri Oct 6 16:21:15 2017 +0100
----------------------------------------------------------------------
.../activemq/console/command/DstatCommand.java | 9 +-
.../activemq/console/DstatCommandTest.java | 88 ++++++++++++++++++++
2 files changed, 93 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/044699c0/activemq-console/src/main/java/org/apache/activemq/console/command/DstatCommand.java
----------------------------------------------------------------------
diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/DstatCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/DstatCommand.java
index cebe693..3237917 100644
--- a/activemq-console/src/main/java/org/apache/activemq/console/command/DstatCommand.java
+++ b/activemq-console/src/main/java/org/apache/activemq/console/command/DstatCommand.java
@@ -118,10 +118,10 @@ public class DstatCommand extends AbstractJmxCommand {
String query = JmxMBeansUtil.createQueryString(queryString, "Queue");
List queueList = JmxMBeansUtil.queryMBeans(createJmxConnection(), query);
- final String header = "%-50s %10s %10s %10s %10s %10s %10s %10s";
- final String tableRow = "%-50s %10d %10d %10d %10d %10d %10d %10d";
+ final String header = "%-50s %10s %10s %10s %10s %10s %10s %10s %10s";
+ final String tableRow = "%-50s %10d %10d %10d %10d %10d %10d %10d %10d";
- context.print(String.format(Locale.US, header, "Name", "Queue Size", "Producer #", "Consumer #", "Enqueue #", "Dequeue #", "Forward #", "Memory %"));
+ context.print(String.format(Locale.US, header, "Name", "Queue Size", "Producer #", "Consumer #", "Enqueue #", "Dequeue #", "Forward #", "Memory %", "Inflight #"));
Collections.sort(queueList, new ObjectInstanceComparator());
@@ -144,7 +144,8 @@ public class DstatCommand extends AbstractJmxCommand {
queueView.getEnqueueCount(),
queueView.getDequeueCount(),
queueView.getForwardCount(),
- queueView.getMemoryPercentUsage()));
+ queueView.getMemoryPercentUsage(),
+ queueView.getInFlightCount()));
}
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/044699c0/activemq-console/src/test/java/org/apache/activemq/console/DstatCommandTest.java
----------------------------------------------------------------------
diff --git a/activemq-console/src/test/java/org/apache/activemq/console/DstatCommandTest.java b/activemq-console/src/test/java/org/apache/activemq/console/DstatCommandTest.java
new file mode 100644
index 0000000..3e2f4d4
--- /dev/null
+++ b/activemq-console/src/test/java/org/apache/activemq/console/DstatCommandTest.java
@@ -0,0 +1,88 @@
+/**
+ * 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.console;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.console.command.DstatCommand;
+import org.apache.activemq.console.formatter.CommandShellOutputFormatter;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.LoggerFactory;
+
+import java.io.ByteArrayOutputStream;
+import java.util.Arrays;
+import java.util.LinkedList;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class DstatCommandTest {
+ private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(DstatCommandTest.class);
+
+ final String CONNECTOR_NAME="tcp-openWire";
+
+ BrokerService brokerService;
+
+
+ @Before
+ public void createBroker() throws Exception {
+ brokerService = new BrokerService();
+ brokerService.getManagementContext().setCreateConnector(false);
+ brokerService.setPersistent(false);
+ brokerService.setDestinations(new ActiveMQDestination[]{new ActiveMQQueue("Q1"), new ActiveMQQueue("Q2"), new ActiveMQTopic("T1")});
+ brokerService.addConnector("tcp://0.0.0.0:0").setName(CONNECTOR_NAME);
+ brokerService.start();
+ }
+
+ @After
+ public void stopBroker() throws Exception {
+ if (brokerService != null) {
+ brokerService.stop();
+ }
+ }
+
+ @Test
+ public void verifyInflightAttribute() throws Exception {
+ String result = executeQuery("");
+ LOG.info("Result:" + result);
+ assertFalse("Output valid", result.contains("Inflight"));
+
+ result = executeQuery("queues");
+ LOG.info("Result:" + result);
+ assertTrue("Output valid", result.contains("Inflight"));
+ }
+
+ private String executeQuery(String query) throws Exception {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(1024);
+ CommandContext context = new CommandContext();
+ context.setFormatter(new CommandShellOutputFormatter(byteArrayOutputStream));
+
+ DstatCommand queryCommand = new DstatCommand();
+ queryCommand.setJmxUseLocal(true);
+ queryCommand.setCommandContext(context);
+
+ LinkedList<String> args = new LinkedList<>();
+ args.addAll(Arrays.asList(query.split(" ")));
+ queryCommand.execute(args);
+
+ return byteArrayOutputStream.toString();
+ }
+}