Skip to content

Commit 9afbe7d

Browse files
indices.merge.disk.check_interval defaults to 0 (#129575)
There is a problem with the disk space checker which blocks (aborting) merges when shards are being closed. Addresses #129335
1 parent 75c602d commit 9afbe7d

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

server/src/main/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorService.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ public class ThreadPoolMergeExecutorService implements Closeable {
5959
/** How frequently we check disk usage (default: 5 seconds). */
6060
public static final Setting<TimeValue> INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING = Setting.positiveTimeSetting(
6161
"indices.merge.disk.check_interval",
62-
TimeValue.timeValueSeconds(5),
62+
// disabled by default
63+
// there's currently a problem where (aborting) merges are blocked when shards are closed (because disk space is insufficient)
64+
// see: https://github.com/elastic/elasticsearch/issues/129335
65+
TimeValue.timeValueSeconds(0),
6366
Property.Dynamic,
6467
Property.NodeScope
6568
);

0 commit comments

Comments
 (0)