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 2015/04/10 06:19:32 UTC
svn commit: r1672537 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index:
AsyncIndexUpdate.java IndexUpdate.java
Author: chetanm
Date: Fri Apr 10 04:19:32 2015
New Revision: 1672537
URL: http://svn.apache.org/r1672537
Log:
OAK-2743 - Log time taken in couple of places in indexing
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java?rev=1672537&r1=1672536&r2=1672537&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java Fri Apr 10 04:19:32 2015
@@ -350,6 +350,7 @@ public class AsyncIndexUpdate implements
NodeState after, String afterCheckpoint, String afterTime)
throws CommitFailedException {
Stopwatch watch = Stopwatch.createStarted();
+ boolean progressLogged = false;
// start collecting runtime statistics
preAsyncRunStatsStats(indexStats);
@@ -405,11 +406,22 @@ public class AsyncIndexUpdate implements
postAsyncRunStatsStatus(indexStats);
}
if (indexUpdate.isReindexingPerformed()) {
- log.info("Reindexing completed for indexes: {} in {}", indexUpdate.getReindexStats(), watch);
+ log.info("Reindexing ({}) completed for indexes: {} in {}", name, indexUpdate.getReindexStats(), watch);
+ progressLogged = true;
}
} finally {
callback.close();
}
+
+ if (!progressLogged) {
+ String msg = "AsyncIndex ({}) update run completed in {}. Indexed {} nodes";
+ //Log at info level if time taken is more than 5 min
+ if (watch.elapsed(TimeUnit.MINUTES) >= 5) {
+ log.info(msg, name, watch, callback.updates);
+ } else {
+ log.debug(msg, name, watch, callback.updates);
+ }
+ }
}
private void mergeWithConcurrencyCheck(
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java?rev=1672537&r1=1672536&r2=1672537&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java Fri Apr 10 04:19:32 2015
@@ -43,6 +43,7 @@ import java.util.Set;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import com.google.common.base.Stopwatch;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -384,6 +385,7 @@ public class IndexUpdate implements Edit
private class CountingCallback implements IndexUpdateCallback {
final String indexName;
final boolean reindex;
+ final Stopwatch watch = Stopwatch.createStarted();
int count;
private CountingCallback(String indexName, boolean reindex) {
@@ -395,7 +397,8 @@ public class IndexUpdate implements Edit
public void indexUpdate() throws CommitFailedException {
count++;
if (count % 10000 == 0){
- log.info("{} => Indexed {} nodes...", indexName, count);
+ log.info("{} => Indexed {} nodes in {} ...", indexName, count, watch);
+ watch.reset().start();
}
updateCallback.indexUpdate();
}