Merged BRANCHES/DEV/THOR1 to HEAD:

30458: ALF-10100: need to be able to apply %age or abs disk space usage constraints on ${dir.cachedcontent}
   30573: ALF-9613: Add min age of files checking to cached content cleaner
   30594: ALF-10100: added more sensible default in sample config for quota size (4GB)
   30695: ALF-10391, ALF-10392: Added MBeans and improved logging for monitoring purposes.
   30850: THOR-202: CachingContentStore quota manager should reject large files
   30901: Added warn-level logging about failure to cache content item
   30951: THOR-217 - when the quota is met or exceeded, then next time the cleaner runs it must use some strategy to make some space.





git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30956 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2011-10-04 18:08:22 +00:00
parent c631041e26
commit 43a7b41d3f
27 changed files with 2285 additions and 111 deletions

View File

@@ -24,16 +24,20 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
import org.alfresco.repo.cache.SimpleCache;
import org.alfresco.repo.content.caching.ContentCacheImpl.NumericFileNameComparator;
import org.alfresco.repo.content.filestore.FileContentReader;
import org.alfresco.repo.content.filestore.FileContentWriter;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.util.GUID;
import org.alfresco.util.TempFileProvider;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
@@ -59,6 +63,26 @@ public class ContentCacheImplTest
}
@Test(expected=IllegalArgumentException.class)
public void cannotSetNullCacheRoot()
{
contentCache.setCacheRoot(null);
}
@Test
public void willCreateNonExistentCacheRoot()
{
File cacheRoot = new File(TempFileProvider.getTempDir(), GUID.generate());
cacheRoot.deleteOnExit();
assertFalse("Pre-condition of test is that cacheRoot does not exist", cacheRoot.exists());
contentCache.setCacheRoot(cacheRoot);
assertTrue("cacheRoot should have been created", cacheRoot.exists());
}
@Test
public void canGetReaderForItemInCacheHavingLiveFile()
{
@@ -96,14 +120,6 @@ public class ContentCacheImplTest
Mockito.verify(lookupTable).get(Key.forCacheFile(path));
}
}
private File tempfile()
{
File file = TempFileProvider.createTempFile("cached-content", ".bin");
file.deleteOnExit();
return file;
}
@Test(expected=CacheMissException.class)
@@ -211,6 +227,17 @@ public class ContentCacheImplTest
Mockito.verify(lookupTable).remove(Key.forCacheFile(path));
}
@Test
public void deleteFile()
{
File cacheFile = tempfile();
assertTrue("Temp file should have been written", cacheFile.exists());
Mockito.when(contentCache.getCacheFilePath("url")).thenReturn(cacheFile.getAbsolutePath());
contentCache.deleteFile("url");
assertFalse("File should have been deleted", cacheFile.exists());
}
@Test
public void getWriter()
@@ -225,4 +252,81 @@ public class ContentCacheImplTest
Mockito.verify(lookupTable).put(Key.forUrl(url), writer.getFile().getAbsolutePath());
Mockito.verify(lookupTable).put(Key.forCacheFile(writer.getFile().getAbsolutePath()), url);
}
@Test
public void compareNumericFileNames()
{
NumericFileNameComparator comparator = new NumericFileNameComparator();
assertEquals(-1, comparator.compare(new File("1"), new File("2")));
assertEquals(0, comparator.compare(new File("2"), new File("2")));
assertEquals(1, comparator.compare(new File("2"), new File("1")));
// Make sure that ordering is numeric and not by string value
assertEquals(-1, comparator.compare(new File("3"), new File("20")));
assertEquals(1, comparator.compare(new File("20"), new File("3")));
assertEquals(-1, comparator.compare(new File("3"), new File("non-numeric")));
assertEquals(1, comparator.compare(new File("non-numeric"), new File("3")));
}
@Test
public void canVisitOldestDirsFirst()
{
File cacheRoot = new File(TempFileProvider.getTempDir(), GUID.generate());
cacheRoot.deleteOnExit();
contentCache.setCacheRoot(cacheRoot);
File f1 = tempfile(createDirs("2000/3/30/17/45/31"), "files-are-unsorted.bin");
File f2 = tempfile(createDirs("2000/3/4/17/45/31"), "another-file.bin");
File f3 = tempfile(createDirs("2010/12/24/23/59/58"), "a-second-before.bin");
File f4 = tempfile(createDirs("2010/12/24/23/59/59"), "last-one.bin");
File f5 = tempfile(createDirs("2000/1/7/2/7/12"), "first-one.bin");
// Check that directories and files are visited in correct order
FileHandler handler = Mockito.mock(FileHandler.class);
contentCache.processFiles(handler);
InOrder inOrder = Mockito.inOrder(handler);
inOrder.verify(handler).handle(f5);
inOrder.verify(handler).handle(f2);
inOrder.verify(handler).handle(f1);
inOrder.verify(handler).handle(f3);
inOrder.verify(handler).handle(f4);
}
private File tempfile()
{
return tempfile("cached-content", ".bin");
}
private File tempfile(String name, String suffix)
{
File file = TempFileProvider.createTempFile(name, suffix);
file.deleteOnExit();
return file;
}
private File tempfile(File dir, String name)
{
File f = new File(dir, name);
try
{
f.createNewFile();
}
catch (IOException error)
{
throw new RuntimeException(error);
}
f.deleteOnExit();
return f;
}
private File createDirs(String path)
{
File f = new File(contentCache.getCacheRoot(), path);
f.mkdirs();
return f;
}
}