svn commit: r1796083 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/ oak-run/src/main/java/org/apache/jackrabbit/oak/index/ oak-run/src/main/resources/

[ch...@apache.org]

Author: chetanm
Date: Wed May 24 17:03:24 2017
New Revision: 1796083

URL: http://svn.apache.org/viewvc?rev=1796083&view=rev
Log:
OAK-5970 - (Re-)Indexing: estimate progress / ETA

Handle include and exclude of paths

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimator.java
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexer.java
    jackrabbit/oak/trunk/oak-run/src/main/resources/logback.xml

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimator.java?rev=1796083&r1=1796082&r2=1796083&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimator.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimator.java Wed May 24 17:03:24 2017
@@ -28,11 +28,14 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.apache.jackrabbit.oak.plugins.index.PathFilter.PROP_EXCLUDED_PATHS;
 import static org.apache.jackrabbit.oak.plugins.index.PathFilter.PROP_INCLUDED_PATHS;
 
 public class NodeCounterMBeanEstimator implements NodeCountEstimator {
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final NodeCounter counter;
     private final NodeStore nodeStore;
 
@@ -66,6 +69,8 @@ public class NodeCounterMBeanEstimator i
                     totalCount -= estimate;
                 }
             }
+
+            log.info("Paths to be traversed {}", pp);
             return totalCount;
         }
     }
@@ -97,5 +102,10 @@ public class NodeCounterMBeanEstimator i
 
             PathUtils.unifyInExcludes(includes, excludes);
         }
+
+        @Override
+        public String toString() {
+            return String.format("includedPath : %s, excludedPaths : %s", includes, excludes);
+        }
     }
 }

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=1796083&r1=1796082&r2=1796083&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 Wed May 24 17:03:24 2017
@@ -274,8 +274,7 @@ public class OutOfBandIndexer implements
             indexUpdate.setTraversalRateEstimator(new MetricRateEstimator(REINDEX_LANE, registry));
         }
 
-        NodeCounter nodeCounter = new NodeCounter(indexHelper.getNodeStore());
-        NodeCounterMBeanEstimator estimator = new NodeCounterMBeanEstimator(nodeCounter);
+        NodeCounterMBeanEstimator estimator = new NodeCounterMBeanEstimator(indexHelper.getNodeStore());
         indexUpdate.setNodeCountEstimator(estimator);
     }
 }

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=1796083&r1=1796082&r2=1796083&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/resources/logback.xml (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/resources/logback.xml Wed May 24 17:03:24 2017
@@ -44,6 +44,7 @@
   <!-- For index tooling -->
   <logger name="org.apache.jackrabbit.oak.index" level="INFO"/>
   <logger name="org.apache.jackrabbit.oak.plugins.index.IndexUpdate" level="INFO"/>
+  <logger name="org.apache.jackrabbit.oak.plugins.index.progress" level="INFO"/>
 
   <!-- Display information messages from oak-run check (oak-segment) -->
   <logger name="org.apache.jackrabbit.oak.plugins.segment.file.tooling.ConsistencyChecker" level="DEBUG"/>