Author: chetanm
Date: Tue Jul 11 05:15:39 2017
New Revision: 1801557
URL: http://svn.apache.org/viewvc?rev=1801557&view=rev
Log:
OAK-6271 - Support for importing index files
-- Enable info logs for importer
-- Log the time taken at various stages
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
jackrabbit/oak/trunk/oak-run/src/main/resources/logback.xml
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=1801557&r1=1801556&r2=1801557&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
Tue Jul 11 05:15:39 2017
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.nio.file.Path;
import java.util.concurrent.TimeUnit;
+import com.google.common.base.Stopwatch;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Closer;
import joptsimple.OptionParser;
@@ -158,6 +159,7 @@ public class IndexCommand implements Com
}
private void performReindexInReadWriteMode(IndexOptions indexOpts) throws
Exception {
+ Stopwatch w = Stopwatch.createStarted();
//TODO To support restart we need to store this checkpoint somewhere
String checkpoint =
connectInReadWriteModeAndCreateCheckPoint(indexOpts);
log.info("Created checkpoint [{}] for indexing", checkpoint);
@@ -165,10 +167,12 @@ public class IndexCommand implements Com
log.info("Proceeding to reindex with read only access to NodeStore");
File indexDir = performReindexInReadOnlyMode(indexOpts, checkpoint);
+ Stopwatch importWatch = Stopwatch.createStarted();
log.info("Proceeding to import index data from [{}] by connecting to
NodeStore in read-write mode", getPath(indexDir));
connectInReadWriteModeAndImportIndex(indexOpts, indexDir);
+ log.info("Indexes imported successfully in {}", importWatch);
- log.info("Indexes imported successfully");
+ log.info("Indexing completed successfully in {}", w);
}
private File performReindexInReadOnlyMode(IndexOptions indexOpts, String
checkpoint) throws Exception {
Modified: jackrabbit/oak/trunk/oak-run/src/main/resources/logback.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/resources/logback.xml?rev=1801557&r1=1801556&r2=1801557&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/resources/logback.xml (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/resources/logback.xml Tue Jul 11
05:15:39 2017
@@ -43,6 +43,7 @@
<!-- For index tooling -->
<logger name="org.apache.jackrabbit.oak.index" level="INFO"/>
+ <logger name="org.apache.jackrabbit.oak.plugins.index.importer"
level="INFO"/>
<logger name="org.apache.jackrabbit.oak.plugins.index.IndexUpdate"
level="INFO"/>
<logger name="org.apache.jackrabbit.oak.plugins.index.progress"
level="INFO"/>
