Repository: activemq-artemis Updated Branches: refs/heads/master d170639bf -> f29c238bc
ARTEMIS-1433 adding AddressMemoryUsage() and AddressMemoryUsagePercentage() to ActiveMQServerControl Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/50fcd48e Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/50fcd48e Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/50fcd48e Branch: refs/heads/master Commit: 50fcd48e28736f6d2992ad1cfd5b0166fb5085f1 Parents: d170639 Author: Pat Fox <pat.g....@gmail.com> Authored: Fri Sep 22 10:54:07 2017 +0200 Committer: Clebert Suconic <clebertsuco...@apache.org> Committed: Mon Sep 25 10:37:16 2017 -0400 ---------------------------------------------------------------------- .../core/management/ActiveMQServerControl.java | 13 +++ .../impl/ActiveMQServerControlImpl.java | 32 ++++++++ .../management/ActiveMQServerControlTest.java | 85 ++++++++++++++++++++ .../ActiveMQServerControlUsingCoreTest.java | 20 +++++ 4 files changed, 150 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/50fcd48e/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java index e6fe7f5..e9bf135 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java @@ -438,6 +438,19 @@ public interface ActiveMQServerControl { @Attribute(desc = "global maximum limit for in-memory messages, in bytes") long getGlobalMaxSize(); + + /** + * Returns the memory used by all the addresses on broker for in-memory messages + */ + @Attribute(desc = "memory used by all the addresses on broker for in-memory messages") + long getAddressMemoryUsage(); + + /** + * Returns the memory used by all the addresses on broker as a percentage of global maximum limit + */ + @Attribute(desc = "memory used by all the addresses on broker as a percentage of global maximum limit") + int getAddressMemoryUsagePercentage(); + // Operations ---------------------------------------------------- @Operation(desc = "Isolate the broker", impact = MBeanOperationInfo.ACTION) boolean freezeReplication(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/50fcd48e/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java index f2aec1c..1e44b0f 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java @@ -578,6 +578,38 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } @Override + public long getAddressMemoryUsage() { + checkStarted(); + clearIO(); + try { + //this should not happen but if it does, return -1 to highlight it is not working + if (server.getPagingManager() == null) { + return -1L; + } + return server.getPagingManager().getGlobalSize(); + } finally { + blockOnIO(); + } + } + + @Override + public int getAddressMemoryUsagePercentage() { + long globalMaxSize = getGlobalMaxSize(); + // no max size set implies 0% used + if (globalMaxSize <= 0) { + return 0; + } + + long memoryUsed = getAddressMemoryUsage(); + if (memoryUsed <= 0) { + return 0; + } + + double result = (100D * memoryUsed) / globalMaxSize; + return (int) result; + } + + @Override public boolean freezeReplication() { Activation activation = server.getActivation(); if (activation instanceof SharedNothingLiveActivation) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/50fcd48e/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java index dd67d89..0b6e684 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java @@ -20,12 +20,14 @@ import javax.json.JsonArray; import javax.json.JsonObject; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; +import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.UUID; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.JsonUtil; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.TransportConfiguration; @@ -1125,6 +1127,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase { locator.close(); } + @Test public void testTotalMessagesAcknowledged() throws Exception { String random1 = RandomUtil.randomString(); @@ -1878,6 +1881,65 @@ public class ActiveMQServerControlTest extends ManagementTestBase { } @Test + public void testMemoryUsagePercentage() throws Exception { + //messages size 100K + final int MESSAGE_SIZE = 100000; + String name1 = "messageUsagePercentage.test.1"; + + server.stop(); + //no globalMaxSize set + server.getConfiguration().setGlobalMaxSize(-1); + server.start(); + + ActiveMQServerControl serverControl = createManagementControl(); + // check before adding messages + assertEquals("Memory Usage before adding messages", 0, serverControl.getAddressMemoryUsage()); + assertEquals("MemoryUsagePercentage", 0, serverControl.getAddressMemoryUsagePercentage()); + + try (ServerLocator locator = createInVMNonHALocator(); ClientSessionFactory csf = createSessionFactory(locator); ClientSession session = csf.createSession()) { + session.createQueue(name1, RoutingType.ANYCAST, name1); + ClientProducer producer1 = session.createProducer(name1); + sendMessagesWithPredefinedSize(30, session, producer1, MESSAGE_SIZE); + + //it is hard to predict an exact number so checking if it falls in a certain range: totalSizeOfMessageSent < X > totalSizeofMessageSent + 100k + assertTrue("Memory Usage within range ", ((30 * MESSAGE_SIZE) < serverControl.getAddressMemoryUsage()) && (serverControl.getAddressMemoryUsage() < ((30 * MESSAGE_SIZE) + 100000))); + // no globalMaxSize set so it should return zero + assertEquals("MemoryUsagePercentage", 0, serverControl.getAddressMemoryUsagePercentage()); + } + } + + @Test + public void testMemoryUsage() throws Exception { + //messages size 100K + final int MESSAGE_SIZE = 100000; + String name1 = "messageUsage.test.1"; + String name2 = "messageUsage.test.2"; + + server.stop(); + // set to 5 MB + server.getConfiguration().setGlobalMaxSize(5000000); + server.start(); + + ActiveMQServerControl serverControl = createManagementControl(); + // check before adding messages + assertEquals("Memory Usage before adding messages", 0, serverControl.getAddressMemoryUsage()); + assertEquals("MemoryUsagePercentage", 0, serverControl.getAddressMemoryUsagePercentage()); + + try (ServerLocator locator = createInVMNonHALocator(); ClientSessionFactory csf = createSessionFactory(locator); ClientSession session = csf.createSession()) { + session.createQueue(name1, RoutingType.ANYCAST, name1); + session.createQueue(name2, RoutingType.ANYCAST, name2); + ClientProducer producer1 = session.createProducer(name1); + ClientProducer producer2 = session.createProducer(name2); + sendMessagesWithPredefinedSize(10, session, producer1, MESSAGE_SIZE); + sendMessagesWithPredefinedSize(10, session, producer2, MESSAGE_SIZE); + + //it is hard to predict an exact number so checking if it falls in a certain range: totalSizeOfMessageSent < X > totalSizeofMessageSent + 100k + assertTrue("Memory Usage within range ", ((20 * MESSAGE_SIZE) < serverControl.getAddressMemoryUsage()) && (serverControl.getAddressMemoryUsage() < ((20 * MESSAGE_SIZE) + 100000))); + assertTrue("MemoryUsagePercentage", (40 <= serverControl.getAddressMemoryUsagePercentage()) && (42 >= serverControl.getAddressMemoryUsagePercentage())); + } + } + + @Test public void testConnectorServiceManagement() throws Exception { ActiveMQServerControl managementControl = createManagementControl(); managementControl.createConnectorService("myconn", FakeConnectorServiceFactory.class.getCanonicalName(), new HashMap<String, Object>()); @@ -1976,6 +2038,29 @@ public class ActiveMQServerControlTest extends ManagementTestBase { return jsonFilterObject.toString(); } + private void sendMessagesWithPredefinedSize(int numberOfMessages, + ClientSession session, + ClientProducer producer, + int messageSize) throws Exception { + ClientMessage message; + final byte[] body = new byte[messageSize]; + ByteBuffer bb = ByteBuffer.wrap(body); + for (int i = 1; i <= messageSize; i++) { + bb.put(getSamplebyte(i)); + } + + for (int i = 0; i < numberOfMessages; i++) { + message = session.createMessage(true); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); + bodyLocal.writeBytes(body); + + producer.send(message); + if (i % 1000 == 0) { + session.commit(); + } + } + session.commit(); + } // Inner classes ------------------------------------------------- } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/50fcd48e/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java index 8910b1c..a78ffcf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java @@ -620,6 +620,26 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes } @Override + public long getAddressMemoryUsage() { + try { + return (Long) proxy.invokeOperation("getAddressMemoryUsage"); + } catch (Exception e) { + e.printStackTrace(); + } + return 0; + } + + @Override + public int getAddressMemoryUsagePercentage() { + try { + return (Integer) proxy.invokeOperation(Integer.TYPE, "getAddressMemoryUsagePercentage"); + } catch (Exception e) { + e.printStackTrace(); + } + return 0; + } + + @Override public boolean freezeReplication() { return false;
