Author: amitj
Date: Wed May 31 07:27:16 2017
New Revision: 1796988
URL: http://svn.apache.org/viewvc?rev=1796988&view=rev
Log:
OAK-6283: FileCache should ignore when file evicted with replacement
Ignore deletion from cache when evicted with REPLACE
Modified:
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java
Modified:
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java?rev=1796988&r1=1796987&r2=1796988&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java
Wed May 31 07:27:16 2017
@@ -113,7 +113,8 @@ public class FileCache extends AbstractC
public void evicted(@Nonnull String key, @Nullable File
cachedFile,
@Nonnull RemovalCause cause) {
try {
- if (cachedFile != null && cachedFile.exists()) {
+ if (cachedFile != null && cachedFile.exists()
+ && cause != RemovalCause.REPLACED) {
DataStoreCacheUtils.recursiveDelete(cachedFile,
cacheRoot);
LOG.info("File [{}] evicted with reason [{}]",
cachedFile, cause
.toString());
Modified:
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java?rev=1796988&r1=1796987&r2=1796988&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java
Wed May 31 07:27:16 2017
@@ -309,6 +309,25 @@ public class FileCacheTest extends Abstr
}
/**
+ * test eviction on replacement.
+ * @throws Exception
+ */
+ @Test
+ public void evictReplace() throws Exception {
+ LOG.info("Started evictReplace");
+
+ File f = createFile(0, loader, cache, folder);
+ assertCache(0, cache, f);
+
+ // Again put in cache to trigger eviction with replacement
+ cache.put(ID_PREFIX + 0, f);
+ // File should still be present
+ assertCache(0, cache, f);
+
+ LOG.info("Finished evictReplace");
+ }
+
+ /**
* Retrieve and invalidate concurrently.
* @throws Exception
*/
