Skip to content

Commit c7530d2

Browse files
Restore setting default
1 parent 4baa30c commit c7530d2

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

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

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

0 commit comments

Comments
 (0)