svn commit: r1794010 - in /jackrabbit/oak/trunk: oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/

[chetanm]

Author: chetanm
Date: Fri May  5 10:55:21 2017
New Revision: 1794010

URL: http://svn.apache.org/viewvc?rev=1794010&view=rev
Log:
OAK-6176 - Service to provide access to async indexer state

Expose the async indexer name as part of IndexStatsMBean interface itself
in addition to service property

Modified:
    
jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java

Modified: 
jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java?rev=1794010&r1=1794009&r2=1794010&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java
 Fri May  5 10:55:21 2017
@@ -38,6 +38,11 @@ public interface IndexStatsMBean {
     String STATUS_INTERRUPTED = "interrupted";
 
     /**
+     * Name of the async indexing lane
+     */
+    String getName();
+
+    /**
      * @return The time the indexing job stared at, or {@code ""} if it is
      *         not currently running.
      */

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=1794010&r1=1794009&r2=1794010&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 May  5 10:55:21 2017
@@ -999,6 +999,11 @@ public class AsyncIndexUpdate implements
         }
 
         @Override
+        public String getName() {
+            return name;
+        }
+
+        @Override
         public String getStart() {
             return start;
         }

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java?rev=1794010&r1=1794009&r2=1794010&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java
 Fri May  5 10:55:21 2017
@@ -27,6 +27,7 @@ import javax.annotation.Nonnull;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean;
 import 
org.apache.jackrabbit.oak.plugins.index.AsyncIndexUpdateTest.CommitInfoCollector;
 import org.apache.jackrabbit.oak.plugins.index.AsyncIndexerService.AsyncConfig;
 import 
org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
@@ -71,6 +72,10 @@ public class AsyncIndexerServiceTest {
 
         AsyncIndexUpdate indexUpdate = getIndexUpdate("async");
 
+        IndexStatsMBean mbean = context.getService(IndexStatsMBean.class);
+        assertNotNull(mbean);
+        assertEquals("async", mbean.getName());
+
         MockOsgi.deactivate(service);
         assertNull(context.getService(Runnable.class));
         assertTrue(indexUpdate.isClosed());