|
51 | 51 | public class ThreadPoolMergeExecutorService implements Closeable { |
52 | 52 | /** How frequently we check disk usage (default: 5 seconds). */ |
53 | 53 | public static final Setting<TimeValue> INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING = Setting.timeSetting( |
54 | | - "indices.merge.disk.check_interval", |
55 | | - TimeValue.timeValueSeconds(5), |
56 | | - TimeValue.MINUS_ONE, |
57 | | - Setting.Property.NodeScope |
| 54 | + "indices.merge.disk.check_interval", |
| 55 | + TimeValue.timeValueSeconds(5), |
| 56 | + TimeValue.MINUS_ONE, |
| 57 | + Setting.Property.NodeScope |
58 | 58 | ); |
59 | 59 | public static final Setting<RelativeByteSizeValue> INDICES_MERGE_DISK_HIGH_WATERMARK_SETTING = new Setting<>( |
60 | 60 | "indices.merge.disk.watermark.high", |
@@ -201,8 +201,11 @@ private ThreadPoolMergeExecutorService(ThreadPool threadPool, Settings settings, |
201 | 201 | assert concurrentMergesFloorLimitForThrottling <= concurrentMergesCeilLimitForThrottling; |
202 | 202 | this.leastAvailableDiskSpaceBytes = new AtomicLong(); |
203 | 203 | this.diskSpaceMonitor = threadPool.scheduleWithFixedDelay( |
204 | | - new DiskSpaceMonitor(INDICES_MERGE_DISK_HIGH_WATERMARK_SETTING.get(settings), |
205 | | - INDICES_MERGE_DISK_HIGH_MAX_HEADROOM_SETTING.get(settings), nodeEnvironment.dataPaths()), |
| 204 | + new DiskSpaceMonitor( |
| 205 | + INDICES_MERGE_DISK_HIGH_WATERMARK_SETTING.get(settings), |
| 206 | + INDICES_MERGE_DISK_HIGH_MAX_HEADROOM_SETTING.get(settings), |
| 207 | + nodeEnvironment.dataPaths() |
| 208 | + ), |
206 | 209 | INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.get(settings), |
207 | 210 | threadPool.generic() |
208 | 211 | ); |
|
0 commit comments