a cleaner fix for #088b342

Author: rjernst

src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java

@@ -29,6 +29,7 @@
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.node.settings.NodeSettingsService;
+import org.elasticsearch.threadpool.ThreadPool;
 
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -95,14 +96,8 @@ public RecoverySettings(Settings settings, NodeSettingsService nodeSettingsServi
     }
 
     public void close() {
-        concurrentStreamPool.shutdown();
-        try {
-            concurrentStreamPool.awaitTermination(1, TimeUnit.SECONDS);
-            concurrentSmallFileStreamPool.awaitTermination(1, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            // that's fine...
-        }
-        concurrentStreamPool.shutdownNow();
+        ThreadPool.terminate(concurrentStreamPool, 1, TimeUnit.SECONDS);
+        ThreadPool.terminate(concurrentSmallFileStreamPool, 1, TimeUnit.SECONDS);
     }
 
     public ByteSizeValue fileChunkSize() {

src/main/java/org/elasticsearch/threadpool/ThreadPool.java

@@ -731,4 +731,23 @@ public void onRefreshSettings(Settings settings) {
             updateSettings(settings);
         }
     }
+
+    /**
+     * Returns <code>true</code> if the given service was terminated successfully. If the termination timed out,
+     * the service is <code>null</code> this method will return <code>false</code>.
+     */
+    public static boolean terminate(ExecutorService service, long timeout, TimeUnit timeUnit) {
+        if (service != null) {
+            service.shutdown();
+            try {
+                if (service.awaitTermination(timeout, timeUnit)) {
+                    return true;
+                }
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+            service.shutdownNow();
+        }
+        return false;
+    }
 }