From 98bc9de792ce3ef765fd787d4c7c050945089598 Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Wed, 27 Jan 2016 15:38:15 +0100 Subject: [PATCH] apply feedback from @mikemccand --- .../src/main/java/org/elasticsearch/index/IndexService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/index/IndexService.java b/core/src/main/java/org/elasticsearch/index/IndexService.java index 789fabc9634..4c91fe7b568 100644 --- a/core/src/main/java/org/elasticsearch/index/IndexService.java +++ b/core/src/main/java/org/elasticsearch/index/IndexService.java @@ -147,9 +147,9 @@ public final class IndexService extends AbstractIndexComponent implements IndexC this.listeners[0] = slowLog; System.arraycopy(listenersIn, 0, this.listeners, 1, listenersIn.length); // kick off async ops for the first shard in this index - this.fsyncTask = indexSettings.getTranslogDurability() == Translog.Durability.REQUEST ? null : new AsyncTranslogFSync(this); this.refreshTask = new AsyncRefreshTask(this); searchSlowLog = new SearchSlowLog(indexSettings); + rescheduleFsyncTask(indexSettings.getTranslogDurability()); } public int numberOfShards() { @@ -582,7 +582,9 @@ public final class IndexService extends AbstractIndexComponent implements IndexC private void rescheduleFsyncTask(Translog.Durability durability) { try { - IOUtils.closeWhileHandlingException(fsyncTask); + if (fsyncTask != null) { + fsyncTask.close(); + } } finally { fsyncTask = durability == Translog.Durability.REQUEST ? null : new AsyncTranslogFSync(this); }