inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/DEV/THOR1 to HEAD:

Browse Source 
32573: THOR-659: Caching Content Store blocked readers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32628 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2011-12-08 09:57:57 +00:00
parent 59e3881470
commit a411eb6fe0
6 changed files with 141 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategy.java
View File

@@ -88,7 +88,7 @@ public class StandardQuotaStrategy implements QuotaManagerStrategy, UsageTracker
loadDiskUsage();
// Run the cleaner thread so that it can update the disk usage more accurately.
runCleanerThread("quota (init)");
signalCleanerStart("quota (init)");
}
@@ -170,7 +170,7 @@ public class StandardQuotaStrategy implements QuotaManagerStrategy, UsageTracker
log.debug("Panic threshold reached (" + panicThresholdPct +
"%) - vetoing disk write and starting cached content cleaner.");
}
runCleanerThread("quota (panic threshold)");
signalCleanerStart("quota (panic threshold)");
return false;
}
@@ -203,7 +203,7 @@ public class StandardQuotaStrategy implements QuotaManagerStrategy, UsageTracker
log.debug("Usage has reached or exceeded quota limit, limit: " + maxUsageBytes +
" bytes, current usage: " + getCurrentUsageBytes() + " bytes.");
}
runAggressiveCleanerThread("quota (limit reached)");
signalAggressiveCleanerStart("quota (limit reached)");
}
else if (usageHasReached(cleanThresholdPct))
{
@@ -213,7 +213,7 @@ public class StandardQuotaStrategy implements QuotaManagerStrategy, UsageTracker
log.debug("Usage has reached " + cleanThresholdPct + "% - starting cached content cleaner.");
}
runCleanerThread("quota (clean threshold)");
signalCleanerStart("quota (clean threshold)");
}
return keepNewFile;
@@ -223,27 +223,17 @@ public class StandardQuotaStrategy implements QuotaManagerStrategy, UsageTracker
/**
* Run the cleaner in a new thread.
*/
private void runCleanerThread(final String reason, final boolean aggressive)
private void signalCleanerStart(final String reason, final boolean aggressive)
{
Runnable cleanerRunner = new Runnable()
{
@Override
public void run()
{
if (aggressive)
{
long targetReductionBytes = (long) (((double) targetUsagePct / 100) * maxUsageBytes);
cleaner.executeAggressive(reason, targetReductionBytes);
}
else
{
cleaner.execute(reason);
}
}
};
Thread cleanerThread = new Thread(cleanerRunner, getClass().getSimpleName() + " cleaner");
cleanerThread.setDaemon(true);
cleanerThread.start();
if (aggressive)
{
long targetReductionBytes = (long) (((double) targetUsagePct / 100) * maxUsageBytes);
cleaner.executeAggressive(reason, targetReductionBytes);
}
else
{
cleaner.execute(reason);
}
}
/**
@@ -251,9 +241,9 @@ public class StandardQuotaStrategy implements QuotaManagerStrategy, UsageTracker
*
* @param reason
*/
private void runCleanerThread(final String reason)
private void signalCleanerStart(final String reason)
{
runCleanerThread(reason, false);
signalCleanerStart(reason, false);
}
/**
@@ -261,9 +251,9 @@ public class StandardQuotaStrategy implements QuotaManagerStrategy, UsageTracker
*
* @param reason
*/
private void runAggressiveCleanerThread(final String reason)
private void signalAggressiveCleanerStart(final String reason)
{
runCleanerThread(reason, true);
signalCleanerStart(reason, true);
}