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

https://issues.apache.org/jira/browse/AMQ-4832 - apply patch from Matthew Walker with thanks

This commit is contained in:
gtully 2013-10-31 21:16:17 +00:00
parent 582af3e74a
commit 855419359c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1908,14 +1908,16 @@ public class BrokerService implements Service {
dir = dir.getParentFile(); dir = dir.getParentFile();
} }
long storeLimit = usage.getStoreUsage().getLimit(); long storeLimit = usage.getStoreUsage().getLimit();
long storeCurrent = usage.getStoreUsage().getUsage();
long dirFreeSpace = dir.getUsableSpace(); long dirFreeSpace = dir.getUsableSpace();
if (storeLimit > dirFreeSpace) { if (storeLimit > (dirFreeSpace + storeCurrent)) {
LOG.warn("Store limit is " + storeLimit / (1024 * 1024) + LOG.warn("Store limit is " + storeLimit / (1024 * 1024) +
" mb, whilst the data directory: " + dir.getAbsolutePath() + " mb (current store usage is " + storeCurrent / (1024 * 1024) +
" mb). The data directory: " + dir.getAbsolutePath() +
" only has " + dirFreeSpace / (1024 * 1024) + " only has " + dirFreeSpace / (1024 * 1024) +
" mb of usable space - resetting to maximum available disk space: " + " mb of usable space - resetting to maximum available disk space: " +
dirFreeSpace / (1024 * 1024) + " mb"); (dirFreeSpace + storeCurrent) / (1024 * 1024) + " mb");
usage.getStoreUsage().setLimit(dirFreeSpace); usage.getStoreUsage().setLimit(dirFreeSpace + storeCurrent);
} }
} }