You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2017/06/01 05:19:16 UTC

svn commit: r1797139 - /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java

Author: chetanm
Date: Thu Jun  1 05:19:16 2017
New Revision: 1797139

URL: http://svn.apache.org/viewvc?rev=1797139&view=rev
Log:
OAK-6081 - Indexing tooling via oak-run

Cleanup temp directory at start such that if persistentCache is stored
there then it does not get removed

Modified:
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java

Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java?rev=1797139&r1=1797138&r2=1797139&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java Thu Jun  1 05:19:16 2017
@@ -69,10 +69,13 @@ public class IndexCommand implements Com
 
         IndexOptions indexOpts = opts.getOptionBean(IndexOptions.class);
 
+        //Clean up before setting up NodeStore as the temp
+        //directory might be used by NodeStore for cache stuff like persistentCache
+        setupDirectories(indexOpts);
+
         NodeStoreFixture fixture = NodeStoreFixtureProvider.create(opts);
         try (Closer closer = Closer.create()) {
             closer.register(fixture);
-            setupDirectories(indexOpts);
             StatisticsProvider statisticsProvider = WhiteboardUtils.getService(fixture.getWhiteboard(), StatisticsProvider.class);
             execute(fixture.getStore(), fixture.getBlobStore(), statisticsProvider, indexOpts, closer);
             tellReportPaths();