From eb64a81d0593c2c3732f9a108b353ee24c9d2587 Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Mon, 21 Dec 2015 14:39:58 +0100
Subject: [PATCH] Remove `index.merge.scheduler.notify_on_failure` and default
 to `true`

This setting was undocumented and should not be set by any user. We should
fail the shard instead.

Closes  #15570
---
 .../index/engine/InternalEngine.java          | 24 +++++++++----------
 .../index/shard/MergeSchedulerConfig.java     | 20 ++++------------
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
index 80d0b5b3006..7911d219684 100644
--- a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
+++ b/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
@@ -1129,20 +1129,18 @@ public class InternalEngine extends Engine {
         @Override
         protected void handleMergeException(final Directory dir, final Throwable exc) {
             logger.error("failed to merge", exc);
-            if (config().getMergeSchedulerConfig().isNotifyOnMergeFailure()) {
-                engineConfig.getThreadPool().generic().execute(new AbstractRunnable() {
-                    @Override
-                    public void onFailure(Throwable t) {
-                        logger.debug("merge failure action rejected", t);
-                    }
+            engineConfig.getThreadPool().generic().execute(new AbstractRunnable() {
+                @Override
+                public void onFailure(Throwable t) {
+                    logger.debug("merge failure action rejected", t);
+                }
 
-                    @Override
-                    protected void doRun() throws Exception {
-                        MergePolicy.MergeException e = new MergePolicy.MergeException(exc, dir);
-                        failEngine("merge failed", e);
-                    }
-                });
-            }
+                @Override
+                protected void doRun() throws Exception {
+                    MergePolicy.MergeException e = new MergePolicy.MergeException(exc, dir);
+                    failEngine("merge failed", e);
+                }
+            });
         }
     }
 
diff --git a/core/src/main/java/org/elasticsearch/index/shard/MergeSchedulerConfig.java b/core/src/main/java/org/elasticsearch/index/shard/MergeSchedulerConfig.java
index c329722a135..a90bf2d7d91 100644
--- a/core/src/main/java/org/elasticsearch/index/shard/MergeSchedulerConfig.java
+++ b/core/src/main/java/org/elasticsearch/index/shard/MergeSchedulerConfig.java
@@ -29,19 +29,19 @@ import org.elasticsearch.index.IndexSettings;
  * merge operations once they are needed (according to the merge policy).  Merges
  * run in separate threads, and when the maximum number of threads is reached,
  * further merges will wait until a merge thread becomes available.
- * 
+ *
  * <p>The merge scheduler supports the following <b>dynamic</b> settings:
- * 
+ *
  * <ul>
  * <li> <code>index.merge.scheduler.max_thread_count</code>:
- * 
+ *
  *     The maximum number of threads that may be merging at once. Defaults to
  *     <code>Math.max(1, Math.min(4, Runtime.getRuntime().availableProcessors() / 2))</code>
  *     which works well for a good solid-state-disk (SSD).  If your index is on
  *     spinning platter drives instead, decrease this to 1.
- * 
+ *
  * <li><code>index.merge.scheduler.auto_throttle</code>:
- * 
+ *
  *     If this is true (the default), then the merge scheduler will rate-limit IO
  *     (writes) for merges to an adaptive value depending on how many merges are
  *     requested over time.  An application with a low indexing rate that
@@ -55,19 +55,16 @@ public final class MergeSchedulerConfig {
     public static final String MAX_THREAD_COUNT = "index.merge.scheduler.max_thread_count";
     public static final String MAX_MERGE_COUNT = "index.merge.scheduler.max_merge_count";
     public static final String AUTO_THROTTLE = "index.merge.scheduler.auto_throttle";
-    public static final String NOTIFY_ON_MERGE_FAILURE = "index.merge.scheduler.notify_on_failure"; // why would we not wanna do this?
 
     private volatile boolean autoThrottle;
     private volatile int maxThreadCount;
     private volatile int maxMergeCount;
-    private final boolean notifyOnMergeFailure;
 
     public MergeSchedulerConfig(IndexSettings indexSettings) {
         final Settings settings = indexSettings.getSettings();
         maxThreadCount = settings.getAsInt(MAX_THREAD_COUNT, Math.max(1, Math.min(4, EsExecutors.boundedNumberOfProcessors(settings) / 2)));
         maxMergeCount = settings.getAsInt(MAX_MERGE_COUNT, maxThreadCount + 5);
         this.autoThrottle = settings.getAsBoolean(AUTO_THROTTLE, true);
-        notifyOnMergeFailure = settings.getAsBoolean(NOTIFY_ON_MERGE_FAILURE, true);
     }
 
     /**
@@ -114,11 +111,4 @@ public final class MergeSchedulerConfig {
     public void setMaxMergeCount(int maxMergeCount) {
         this.maxMergeCount = maxMergeCount;
     }
-
-    /**
-     * Returns <code>true</code> iff we fail the engine on a merge failure. Default is <code>true</code>
-     */
-    public boolean isNotifyOnMergeFailure() {
-        return notifyOnMergeFailure;
-    }
 }