Backport ShardRecoveryHandlerrefactorings to 1.x

src/main/java/org/elasticsearch/ExceptionsHelper.java

@@ -19,11 +19,13 @@
 
 package org.elasticsearch;
 
+import org.apache.lucene.index.CorruptIndexException;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.rest.RestStatus;
 
+import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.List;
@@ -161,6 +163,9 @@ public static <T extends Throwable> T useOrSupress(T first, T second) {
         return first;
     }
 
+    public static IOException unwrapCorruption(Throwable t) {
+        return (IOException) unwrap(t, CorruptIndexException.class);
+    }
 
     public static <T extends Throwable> T unwrap(Throwable t, Class<T> clazz) {
         if (t != null) {

src/main/java/org/elasticsearch/common/util/concurrent/AbstractRunnable.java

@@ -39,9 +39,19 @@ public final void run() {
             onFailure(ex);
         } catch (Throwable t) {
             onFailure(t);
+        } finally {
+            onAfter();
         }
     }
 
+    /**
+     * This method is called in a finally block after successful execution
+     * or on a rejection.
+     */
+    public void onAfter() {
+        // nothing by default
+    }
+
     /**
      * This method is invoked for all exception thrown by {@link #doRun()}
      */

src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java

@@ -81,7 +81,12 @@ public void execute(Runnable command) {
             if (command instanceof AbstractRunnable) {
                 // If we are an abstract runnable we can handle the rejection
                 // directly and don't need to rethrow it.
-                ((AbstractRunnable)command).onRejection(ex);
+                try {
+                    ((AbstractRunnable) command).onRejection(ex);
+                } finally {
+                    ((AbstractRunnable) command).onAfter();
+
+                }
             } else {
                 throw ex;
             }