svn commit: r1768455 - in /jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene: IndexCopier.java directory/CopyOnWriteDirectory.java

[chetanm]

Author: chetanm
Date: Mon Nov  7 08:47:01 2016
New Revision: 1768455

URL: http://svn.apache.org/viewvc?rev=1768455&view=rev
Log:
OAK-5076 - CopyOnWrite directory should clear working set of files being 
written upon start

Modified:
    
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java
    
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnWriteDirectory.java

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java?rev=1768455&r1=1768454&r2=1768455&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java
 Mon Nov  7 08:47:01 2016
@@ -176,7 +176,6 @@ public class IndexCopier implements Copy
     }
 
     public void clearIndexFilesBeingWritten(String indexPath) {
-        //TODO This should also be removed at start i.e. open of 
CopyOnWriteDirectory
         getSharedWorkingSet(indexPath).clear();
     }
 

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnWriteDirectory.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnWriteDirectory.java?rev=1768455&r1=1768454&r2=1768455&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnWriteDirectory.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnWriteDirectory.java
 Mon Nov  7 08:47:01 2016
@@ -143,6 +143,7 @@ public class CopyOnWriteDirectory extend
         this.executor = executor;
         this.indexPath = indexPath;
         this.reindexMode = reindexMode;
+        indexCopier.clearIndexFilesBeingWritten(indexPath);
         initialize();
     }
 
@@ -447,7 +448,7 @@ public class CopyOnWriteDirectory extend
         @Override
         public IndexOutput createOutput(IOContext context) throws IOException {
             log.debug("[COW][{}] Creating output {}", indexPath, name);
-            return new 
COWLocalFileReference.CopyOnCloseIndexOutput(local.createOutput(name, context));
+            return new CopyOnCloseIndexOutput(local.createOutput(name, 
context));
         }
 
         @Override