From 79cb0eafc498e2f4c7187ef2121c2bb43b8a9712 Mon Sep 17 00:00:00 2001 From: Shay Banon Date: Mon, 20 Aug 2012 02:05:54 +0200 Subject: [PATCH] better close logic for concurrent recovery streams --- .../elasticsearch/indices/recovery/RecoverySettings.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java b/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java index 0509efbc6cd..3439f2843f6 100644 --- 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 class RecoverySettings extends AbstractComponent { public void close() { concurrentStreamPool.shutdown(); + try { + concurrentStreamPool.awaitTermination(1, TimeUnit.SECONDS); + } catch (InterruptedException e) { + // that's fine... + } + concurrentStreamPool.shutdownNow(); } public ByteSizeValue fileChunkSize() {