better close logic for concurrent recovery streams

jaly1983 · Aug 20, 2012 · 79cb0ea · 79cb0ea
1 parent 08ecd9d
commit 79cb0ea
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java b/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java
@@ -85,6 +85,12 @@ public RecoverySettings(Settings settings, NodeSettingsService nodeSettingsServi
 
     public void close() {
         concurrentStreamPool.shutdown();
+        try {
+            concurrentStreamPool.awaitTermination(1, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            // that's fine...
+        }
+        concurrentStreamPool.shutdownNow();
     }
 
     public ByteSizeValue fileChunkSize() {