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 2015/11/24 03:42:24 UTC
[2/2] activemq-artemis git commit: ARTEMIS-201 warn of potential OOME
ARTEMIS-201 warn of potential OOME
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/956c5415
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/956c5415
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/956c5415
Branch: refs/heads/master
Commit: 956c54155f78ec0ee3e89b7c19747e4b89ae2e20
Parents: b8ddb66
Author: jbertram <jb...@apache.org>
Authored: Thu Nov 19 20:41:31 2015 -0600
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Nov 23 21:42:15 2015 -0500
----------------------------------------------------------------------
.../core/server/ActiveMQServerLogger.java | 4 ++
.../core/server/impl/ActiveMQServerImpl.java | 16 ++++++
.../server/PotentialOOMELoggingTest.java | 60 ++++++++++++++++++++
3 files changed, 80 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/956c5415/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
index ab52191..d31e3d1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
@@ -1195,6 +1195,10 @@ public interface ActiveMQServerLogger extends BasicLogger {
@Message(id = 222204, value = "Duplicated Acceptor {0} with parameters {1} classFactory={2} duplicated on the configuration", format = Message.Format.MESSAGE_FORMAT)
void duplicatedAcceptor(String name, String parameters, String classFactory);
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 222205, value = "OutOfMemoryError possible! There are currently {0} addresses with a total max-size-bytes of {1} bytes, but the maximum memory available is {2} bytes.", format = Message.Format.MESSAGE_FORMAT)
+ void potentialOOME(long addressCount, long totalMaxSizeBytes, long maxMemory);
+
@LogMessage(level = Logger.Level.ERROR)
@Message(id = 224000, value = "Failure in initialisation", format = Message.Format.MESSAGE_FORMAT)
void initializationError(@Cause Throwable e);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/956c5415/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 8b5a9bf..5401142 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -1622,6 +1622,8 @@ public class ActiveMQServerImpl implements ActiveMQServer {
// this needs to be done before clustering is fully activated
callActivateCallbacks();
+ checkForPotentialOOMEInAddressConfiguration();
+
if (!scalingDown) {
// Deploy any pre-defined diverts
deployDiverts();
@@ -1674,6 +1676,20 @@ public class ActiveMQServerImpl implements ActiveMQServer {
}
}
+ private void checkForPotentialOOMEInAddressConfiguration() {
+ long totalMaxSizeBytes = 0;
+ long addressCount = 0;
+ for (SimpleString address : postOffice.getAddresses()) {
+ totalMaxSizeBytes += addressSettingsRepository.getMatch(address.toString()).getMaxSizeBytes();
+ addressCount++;
+ }
+
+ long maxMemory = Runtime.getRuntime().maxMemory();
+ if (totalMaxSizeBytes >= maxMemory) {
+ ActiveMQServerLogger.LOGGER.potentialOOME(addressCount, totalMaxSizeBytes, maxMemory);
+ }
+ }
+
private void deployAddressSettingsFromConfiguration() {
for (Map.Entry<String, AddressSettings> entry : configuration.getAddressesSettings().entrySet()) {
addressSettingsRepository.addMatch(entry.getKey(), entry.getValue(), true);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/956c5415/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PotentialOOMELoggingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PotentialOOMELoggingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PotentialOOMELoggingTest.java
new file mode 100644
index 0000000..a25e674
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PotentialOOMELoggingTest.java
@@ -0,0 +1,60 @@
+/*
+ * 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 java.util.UUID;
+
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class PotentialOOMELoggingTest extends ActiveMQTestBase {
+
+ @BeforeClass
+ public static void prepareLogger() {
+ AssertionLoggerHandler.startCapture();
+ }
+
+ @Test
+ /**
+ * When running this test from an IDE add this to the test command line so that the AssertionLoggerHandler works properly:
+ *
+ * -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=file:<path_to_source>/tests/config/logging.properties
+ */
+ public void testBlockLogging() throws Exception {
+ ActiveMQServer server = createServer(false, createDefaultInVMConfig());
+ for (int i = 0; i < 10000; i++) {
+ server.getConfiguration().addQueueConfiguration(new CoreQueueConfiguration().setAddress(UUID.randomUUID().toString()).setName(UUID.randomUUID().toString()));
+ }
+ server.getConfiguration().getAddressesSettings().put("#", new AddressSettings().setMaxSizeBytes(10485760 * 10));
+ server.start();
+
+ // Using the code only so the test doesn't fail just because someone edits the log text
+ Assert.assertTrue("Expected to find 222205", AssertionLoggerHandler.findText("AMQ222205"));
+ }
+
+ @AfterClass
+ public static void clearLogger() {
+ AssertionLoggerHandler.stopCapture();
+ }
+}