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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
59923: Fixes StandardQuotaStrategyTest, that was broken by changes in cache behaviour.
   Non-clustered (Google Guava) caches do not use maxItems as a hard-limit any more - eviction takes place as cache size approaches the limit.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis 2014-02-12 09:42:08 +00:00
parent 13e34899ef
commit 00cd413c12
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/test-java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategyTest.java
View File

@ -109,13 +109,27 @@ public class StandardQuotaStrategyTest
// Quota is 20MB. The quota manager will...
// * start the cleaner at 16MB (80% of 20MB)
// * refuse to cache any more files at 18MB (90% of 20MB)
List<String> contentURLs = new ArrayList<>();
for (int i = 0; i < 15; i++)
{
writeSingleFileInMB(1);
String url = writeSingleFileInMB(1);
contentURLs.add(url);
}
// All 15 should be retained.
assertEquals(15, findCacheFiles().size());
// Simulate eviction from the in-memory cache. We'll evict 10, so that 6 of the
// eventual 16 created files have details remaining in the cache.
//
// Note, we're simulating eviction here, rather than imposing, for example, a maxItems on the
// cache (i.e. the "cachingContentStoreCache" bean) since cache behaviour isn't easily deterministic
// in this respect - the google guava cache in particular, evicts items as the cache size *approaches*
// the size limit.
for (int evictCount = 0; evictCount < 10; evictCount++)
{
cache.remove(contentURLs.get(evictCount));
}
// Writing one more file should trigger a clean.
writeSingleFileInMB(1);
@ -125,10 +139,9 @@ public class StandardQuotaStrategyTest
Thread.sleep(50);
}
// As the cache is set to contain a max of 12 items in-memory (see cachingContentStoreCache
// definition in test-std-quota-context.xml) and 2 cache items are required per cached content URL
// then after the cleaner has processed the tree there will 6 items left on disk (12/2).
assertEquals(6, findCacheFiles().size());
// Since 6 of the 16 total had details in the in-memory cache at the time the cleaner
// ran, then only 6 files should remain on disk - the rest should have been removed by the cleaner.
assertEquals(6, findCacheFiles().size());
}
@ -164,11 +177,12 @@ public class StandardQuotaStrategyTest
assertEquals(3, files.get(2).length() / FileUtils.ONE_MB);
}
private void writeSingleFileInMB(int sizeInMb) throws IOException
private String writeSingleFileInMB(int sizeInMb) throws IOException
{
ContentWriter writer = store.getWriter(ContentContext.NULL_CONTEXT);
File content = createFileOfSize(sizeInMb * 1024);
writer.putContent(content);
return writer.getContentUrl();
}
private File createFileOfSize(long sizeInKB) throws IOException

4
source/test-resources/cachingstore/test-std-quota-context.xml
View File

@ -35,9 +35,7 @@
</bean>
<bean id="cachingContentStoreCache" class="org.alfresco.repo.cache.DefaultSimpleCache">
<property name="maxItems" value="12"/>
</bean>
<bean id="cachingContentStoreCache" class="org.alfresco.repo.cache.DefaultSimpleCache"/>
<bean id="cachedContentCleaner"