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

[ch...@apache.org]

Author: chetanm
Date: Mon May  9 11:06:30 2016
New Revision: 1742916

URL: http://svn.apache.org/viewvc?rev=1742916&view=rev
Log:
OAK-4262 - Provide a way to abort an async indexing run

As suggested by Alex In addtion to abort the indexing should be paused also

Modified:
    jackrabbit/oak/trunk/oak-core/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/AsyncIndexUpdateTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java?rev=1742916&r1=1742915&r2=1742916&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java Mon May  9 11:06:30 2016
@@ -74,9 +74,9 @@ public interface IndexStatsMBean {
      */
     void pause();
 
-    @Description("Aborts any running indexing cycle. It only effects current " +
-            "running cycle")
-    String abort();
+    @Description("Aborts any running indexing cycle and pauses the indexer. Invoke 'resume' once you are read to " +
+            "resume indexing again")
+    String abortAndPause();
 
     /**
      * Resumes the indexing process. All changes from the previous indexed state

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=1742916&r1=1742915&r2=1742916&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 Mon May  9 11:06:30 2016
@@ -365,6 +365,7 @@ public class AsyncIndexUpdate implements
 
     private void runWhenPermitted() {
         if (indexStats.isPaused()) {
+            log.debug("[{}] Ignoring the run as indexing is paused", name);
             return;
         }
         log.debug("[{}] Running background index task", name);
@@ -772,19 +773,26 @@ public class AsyncIndexUpdate implements
         }
 
         @Override
-        public String abort() {
+        public String abortAndPause() {
+            //First pause to avoid any race
+            pause();
+            //Set the forcedStop flag anyway. In resume this would be cleared
+            forcedStopFlag.set(true);
+            String msg = "";
             //Abort if any indexing run is in progress
             if (runPermit.availablePermits() == 0){
-                forcedStopFlag.set(true);
-                return "Abort request placed";
+                msg = "Abort request placed for current run. ";
             }
-            return "No current running indexing found. Nothing to abort!";
+            return msg + "Indexing is paused now. Invoke 'resume' to resume indexing";
         }
 
         @Override
         public void resume() {
             log.debug("[{}] Resuming the async indexer", name);
             this.isPaused = false;
+
+            //Clear the forcedStop flag as fail safe
+            forcedStopFlag.set(false);
         }
 
         @Override

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java?rev=1742916&r1=1742915&r2=1742916&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java Mon May  9 11:06:30 2016
@@ -1253,7 +1253,7 @@ public class AsyncIndexUpdateTest {
         while(!asyncLock.hasQueuedThreads());
 
         assertEquals(IndexStatsMBean.STATUS_RUNNING, async.getIndexStats().getStatus());
-        assertEquals("Abort request placed",async.getIndexStats().abort());
+        assertThat(async.getIndexStats().abortAndPause(), containsString("Abort request placed"));
 
         asyncLock.release();
 
@@ -1266,6 +1266,12 @@ public class AsyncIndexUpdateTest {
 
         //Post abort indexing should be fine
         runOneCycle(async);
+        assertTrue(async.getIndexStats().isPaused());
+
+        //Now resume indexing
+        async.getIndexStats().resume();
+
+        runOneCycle(async);
         assertEquals(IndexStatsMBean.STATUS_DONE, async.getIndexStats().getStatus());
         assertFalse(async.isClosed());
     }