Author: chetanm
Date: Tue Jul 11 11:19:43 2017
New Revision: 1801592
URL: http://svn.apache.org/viewvc?rev=1801592&view=rev
Log:
OAK-6271 - Support for importing index files
Log info message for out-of-band indexing about next step i.e.
invoking the IndexerMBean#import operation
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexer.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=1801592&r1=1801591&r2=1801592&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 11:19:43 2017
@@ -145,7 +145,9 @@ public class IndexCommand implements Com
private void reindex(IndexHelper indexHelper, String checkpoint) throws
IOException, CommitFailedException {
checkNotNull(checkpoint, "Checkpoint value is required for reindexing
done in read only mode");
try (OutOfBandIndexer indexer = new OutOfBandIndexer(indexHelper,
checkpoint)) {
- indexer.reindex();
+ File destDir = indexer.reindex();
+ log.info("To complete indexing import the created index files via
IndexerMBean#importIndex operation with " +
+ "[{}] as input", getPath(destDir));
}
}
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexer.java?rev=1801592&r1=1801591&r2=1801592&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexer.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexer.java
Tue Jul 11 11:19:43 2017
@@ -107,7 +107,7 @@ public class OutOfBandIndexer implements
this.checkpoint = checkNotNull(checkpoint);
}
- public void reindex() throws CommitFailedException, IOException {
+ public File reindex() throws CommitFailedException, IOException {
Stopwatch w = Stopwatch.createStarted();
NodeState checkpointedState = retrieveNodeStateForCheckpoint();
@@ -125,6 +125,7 @@ public class OutOfBandIndexer implements
log.info("Indexing completed for indexes {} in {} and index files are
copied to {}",
indexHelper.getIndexPaths(), w, IndexCommand.getPath(destDir));
+ return destDir;
}
private File getLocalIndexDir() throws IOException {
