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

fix for: https://issues.apache.org/jira/browse/AMQ-2834 

Adds some checks on store limit vs journal max file size similar to the Temp Store limit checks

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1245777 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2012-02-17 21:50:45 +00:00
parent 3a561cc8c7
commit df19a382c9
1 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -42,7 +42,6 @@ import javax.annotation.PreDestroy;
import javax.management.MalformedObjectNameException; import javax.management.MalformedObjectNameException;
import javax.management.ObjectName; import javax.management.ObjectName;
import org.apache.activeio.journal.Journal;
import org.apache.activemq.ActiveMQConnectionMetaData; import org.apache.activemq.ActiveMQConnectionMetaData;
import org.apache.activemq.ConfigurationException; import org.apache.activemq.ConfigurationException;
import org.apache.activemq.Service; import org.apache.activemq.Service;
@ -87,6 +86,7 @@ import org.apache.activemq.security.MessageAuthorizationPolicy;
import org.apache.activemq.selector.SelectorParser; import org.apache.activemq.selector.SelectorParser;
import org.apache.activemq.store.PersistenceAdapter; import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.store.PersistenceAdapterFactory; import org.apache.activemq.store.PersistenceAdapterFactory;
import org.apache.activemq.store.amq.AMQPersistenceAdapter;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter; import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.apache.activemq.store.kahadb.plist.PListStore; import org.apache.activemq.store.kahadb.plist.PListStore;
import org.apache.activemq.store.memory.MemoryPersistenceAdapter; import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
@ -96,7 +96,15 @@ import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.TransportServer; import org.apache.activemq.transport.TransportServer;
import org.apache.activemq.transport.vm.VMTransportFactory; import org.apache.activemq.transport.vm.VMTransportFactory;
import org.apache.activemq.usage.SystemUsage; import org.apache.activemq.usage.SystemUsage;
import org.apache.activemq.util.*; import org.apache.activemq.util.BrokerSupport;
import org.apache.activemq.util.DefaultIOExceptionHandler;
import org.apache.activemq.util.IOExceptionHandler;
import org.apache.activemq.util.IOExceptionSupport;
import org.apache.activemq.util.IOHelper;
import org.apache.activemq.util.InetAddressUtil;
import org.apache.activemq.util.JMXSupport;
import org.apache.activemq.util.ServiceStopper;
import org.apache.activemq.util.URISupport;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.slf4j.MDC; import org.slf4j.MDC;
@ -1692,13 +1700,16 @@ public class BrokerService implements Service {
SystemUsage usage = getSystemUsage(); SystemUsage usage = getSystemUsage();
long memLimit = usage.getMemoryUsage().getLimit(); long memLimit = usage.getMemoryUsage().getLimit();
long jvmLimit = Runtime.getRuntime().maxMemory(); long jvmLimit = Runtime.getRuntime().maxMemory();
if (memLimit > jvmLimit) { if (memLimit > jvmLimit) {
LOG.error("Memory Usage for the Broker (" + memLimit / (1024 * 1024) + LOG.error("Memory Usage for the Broker (" + memLimit / (1024 * 1024) +
" mb) is more than the maximum available for the JVM: " + " mb) is more than the maximum available for the JVM: " +
jvmLimit / (1024 * 1024) + " mb"); jvmLimit / (1024 * 1024) + " mb");
} }
if (getPersistenceAdapter() != null) { if (getPersistenceAdapter() != null) {
File dir = getPersistenceAdapter().getDirectory(); PersistenceAdapter adapter = getPersistenceAdapter();
File dir = adapter.getDirectory();
if (dir != null) { if (dir != null) {
long storeLimit = usage.getStoreUsage().getLimit(); long storeLimit = usage.getStoreUsage().getLimit();
long dirFreeSpace = dir.getFreeSpace(); long dirFreeSpace = dir.getFreeSpace();
@ -1708,7 +1719,26 @@ public class BrokerService implements Service {
" only has " + dirFreeSpace / (1024 * 1024) + " mb of free space"); " only has " + dirFreeSpace / (1024 * 1024) + " mb of free space");
} }
} }
long maxJournalFileSize = 0;
long storeLimit = usage.getStoreUsage().getLimit();
if (adapter instanceof KahaDBPersistenceAdapter) {
KahaDBPersistenceAdapter kahaDB = (KahaDBPersistenceAdapter) adapter;
maxJournalFileSize = kahaDB.getJournalMaxFileLength();
} else if (adapter instanceof AMQPersistenceAdapter) {
AMQPersistenceAdapter amqAdapter = (AMQPersistenceAdapter) adapter;
maxJournalFileSize = amqAdapter.getMaxFileLength();
}
if (storeLimit < maxJournalFileSize) {
LOG.error("Store limit is " + storeLimit / (1024 * 1024) +
" mb, whilst the max journal file size for the store is: " +
maxJournalFileSize / (1024 * 1024) + " mb, " +
"the store will not accept any data when used.");
}
} }
File tmpDir = getTmpDataDirectory(); File tmpDir = getTmpDataDirectory();
if (tmpDir != null) { if (tmpDir != null) {
@ -1731,9 +1761,9 @@ public class BrokerService implements Service {
long maxJournalFileSize; long maxJournalFileSize;
if (usage.getTempUsage().getStore() != null) { if (usage.getTempUsage().getStore() != null) {
maxJournalFileSize = usage.getTempUsage().getStore().getJournalMaxFileLength(); maxJournalFileSize = usage.getTempUsage().getStore().getJournalMaxFileLength();
} else { } else {
maxJournalFileSize = org.apache.kahadb.journal.Journal.DEFAULT_MAX_FILE_LENGTH; maxJournalFileSize = org.apache.kahadb.journal.Journal.DEFAULT_MAX_FILE_LENGTH;
} }
if (storeLimit < maxJournalFileSize) { if (storeLimit < maxJournalFileSize) {