From 53e19aada14d66fe86f3849a1902e7c7c77704bf Mon Sep 17 00:00:00 2001
From: Albert Zaharovits <albert.zaharovits@elastic.co>
Date: Tue, 17 Jun 2025 18:57:09 +0300
Subject: [PATCH] indices.merge.disk.check_interval defaults to 0

---
 .../index/engine/ThreadPoolMergeExecutorService.java         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorService.java b/server/src/main/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorService.java
index 9e74c19d8a85e..c2b1f5e9abb4f 100644
--- a/server/src/main/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorService.java
+++ b/server/src/main/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorService.java
@@ -59,7 +59,10 @@ public class ThreadPoolMergeExecutorService implements Closeable {
     /** How frequently we check disk usage (default: 5 seconds). */
     public static final Setting<TimeValue> INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING = Setting.positiveTimeSetting(
         "indices.merge.disk.check_interval",
-        TimeValue.timeValueSeconds(5),
+        // disabled by default
+        // there's currently a problem where (aborting) merges are blocked when shards are closed (because disk space is insufficient)
+        // see: https://github.com/elastic/elasticsearch/issues/129335
+        TimeValue.timeValueSeconds(0),
         Property.Dynamic,
         Property.NodeScope
     );