Skip to content

Commit d1a0d29

Browse files
andreidanandreidan
committed
Use initializeAndWatch
1 parent 94079f9 commit d1a0d29

3 files changed

Lines changed: 9 additions & 18 deletions

File tree

‎server/src/main/java/org/elasticsearch/action/search/SearchTaskWatchdog.java‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.elasticsearch.common.component.AbstractLifecycleComponent;
1717
import org.elasticsearch.common.settings.ClusterSettings;
1818
import org.elasticsearch.common.settings.Setting;
19-
import org.elasticsearch.common.settings.Settings;
2019
import org.elasticsearch.core.TimeValue;
2120
import org.elasticsearch.monitor.jvm.HotThreads;
2221
import org.elasticsearch.tasks.TaskManager;
@@ -91,22 +90,15 @@ public class SearchTaskWatchdog extends AbstractLifecycleComponent {
9190
private volatile long lastLoggedNanos = 0;
9291
private final AtomicBoolean scheduled = new AtomicBoolean(false);
9392

94-
public SearchTaskWatchdog(Settings settings, ClusterSettings clusterSettings, TaskManager taskManager, ThreadPool threadPool) {
93+
public SearchTaskWatchdog(ClusterSettings clusterSettings, TaskManager taskManager, ThreadPool threadPool) {
9594
this.taskManager = taskManager;
9695
this.threadPool = threadPool;
9796

98-
this.enabled = ENABLED.get(settings);
99-
this.coordinatorThresholdNanos = COORDINATOR_THRESHOLD.get(settings).nanos();
100-
this.dataNodeThresholdNanos = DATA_NODE_THRESHOLD.get(settings).nanos();
101-
this.minThresholdNanos = computeMinThreshold(coordinatorThresholdNanos, dataNodeThresholdNanos);
102-
this.interval = INTERVAL.get(settings);
103-
this.cooldownPeriodNanos = COOLDOWN_PERIOD.get(settings).nanos();
104-
105-
clusterSettings.addSettingsUpdateConsumer(ENABLED, this::setEnabled);
106-
clusterSettings.addSettingsUpdateConsumer(COORDINATOR_THRESHOLD, v -> setCoordinatorThreshold(v.nanos()));
107-
clusterSettings.addSettingsUpdateConsumer(DATA_NODE_THRESHOLD, v -> setDataNodeThreshold(v.nanos()));
108-
clusterSettings.addSettingsUpdateConsumer(INTERVAL, v -> this.interval = v);
109-
clusterSettings.addSettingsUpdateConsumer(COOLDOWN_PERIOD, v -> this.cooldownPeriodNanos = v.nanos());
97+
clusterSettings.initializeAndWatch(ENABLED, this::setEnabled);
98+
clusterSettings.initializeAndWatch(COORDINATOR_THRESHOLD, v -> setCoordinatorThreshold(v.nanos()));
99+
clusterSettings.initializeAndWatch(DATA_NODE_THRESHOLD, v -> setDataNodeThreshold(v.nanos()));
100+
clusterSettings.initializeAndWatch(INTERVAL, v -> this.interval = v);
101+
clusterSettings.initializeAndWatch(COOLDOWN_PERIOD, v -> this.cooldownPeriodNanos = v.nanos());
110102
}
111103

112104
private void setEnabled(boolean enabled) {

‎server/src/main/java/org/elasticsearch/node/NodeConstruction.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1285,7 +1285,6 @@ public <T extends TransportResponse> void sendRequest(
12851285
);
12861286

12871287
final SearchTaskWatchdog searchTaskWatchdog = new SearchTaskWatchdog(
1288-
settings,
12891288
settingsModule.getClusterSettings(),
12901289
transportService.getTaskManager(),
12911290
threadPool

‎server/src/test/java/org/elasticsearch/action/search/SearchTaskWatchdogTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void forEachCancellableTask(long minElapsedNanos, Predicate<CancellableTa
7070
}
7171
};
7272

73-
final var watchdog = new SearchTaskWatchdog(settings, clusterSettings, mockTaskManager, deterministicTaskQueue.getThreadPool());
73+
final var watchdog = new SearchTaskWatchdog(clusterSettings, mockTaskManager, deterministicTaskQueue.getThreadPool());
7474
watchdog.start();
7575

7676
// coordinator has outstanding children, no logging expected
@@ -140,7 +140,7 @@ public void forEachCancellableTask(long minElapsedNanos, Predicate<CancellableTa
140140
}
141141
};
142142

143-
final var watchdog = new SearchTaskWatchdog(settings, clusterSettings, mockTaskManager, deterministicTaskQueue.getThreadPool());
143+
final var watchdog = new SearchTaskWatchdog(clusterSettings, mockTaskManager, deterministicTaskQueue.getThreadPool());
144144
watchdog.start();
145145

146146
// task not exceeding threshold yet
@@ -188,7 +188,7 @@ public void forEachCancellableTask(long minElapsedNanos, Predicate<CancellableTa
188188
}
189189
};
190190

191-
final var watchdog = new SearchTaskWatchdog(settings, clusterSettings, mockTaskManager, deterministicTaskQueue.getThreadPool());
191+
final var watchdog = new SearchTaskWatchdog(clusterSettings, mockTaskManager, deterministicTaskQueue.getThreadPool());
192192
watchdog.start();
193193

194194
assertThat(deterministicTaskQueue.hasDeferredTasks(), is(false));

0 commit comments

Comments
 (0)