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-5967 

Updating temporary limit disk check to take into account space being
used by the temporary store itself
This commit is contained in:
Christopher L. Shannon (cshannon) 2015-09-14 19:46:57 +00:00
parent 226222546a
commit 4f8d56aaf6
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2023,16 +2023,19 @@ public class BrokerService implements Service {
} }
long storeLimit = usage.getTempUsage().getLimit(); long storeLimit = usage.getTempUsage().getLimit();
long storeCurrent = usage.getTempUsage().getUsage();
while (tmpDir != null && !tmpDir.isDirectory()) { while (tmpDir != null && !tmpDir.isDirectory()) {
tmpDir = tmpDir.getParentFile(); tmpDir = tmpDir.getParentFile();
} }
long dirFreeSpace = tmpDir.getUsableSpace(); long dirFreeSpace = tmpDir.getUsableSpace();
if (storeLimit > dirFreeSpace) { if (storeLimit > (dirFreeSpace + storeCurrent)) {
LOG.warn("Temporary Store limit is " + storeLimit / (1024 * 1024) + LOG.warn("Temporary Store limit is " + storeLimit / (1024 * 1024) +
" mb, whilst the temporary data directory: " + tmpDirPath + " mb (current temporary store usage is " + storeCurrent / (1024 * 1024) +
" only has " + dirFreeSpace / (1024 * 1024) + " mb of usable space - resetting to maximum available " + " mb). The temporary data directory: " + tmpDir.getAbsolutePath() +
dirFreeSpace / (1024 * 1024) + " mb."); " only has " + dirFreeSpace / (1024 * 1024) +
usage.getTempUsage().setLimit(dirFreeSpace); " mb of usable space - resetting to maximum available disk space: " +
(dirFreeSpace + storeCurrent) / (1024 * 1024) + " mb");
usage.getTempUsage().setLimit(dirFreeSpace + storeCurrent);
} }
if (isPersistent()) { if (isPersistent()) {