Skip to content

Commit 6637732

Browse files
authored
Clean up node start order (#136966)
Some service starts were added after http start, but these should all be before starting http. In general nothing should be added after http start. This commit moves the offending service starts earlier during startup, and adds a loud comment to deter future such additions.
1 parent 2fd9d33 commit 6637732

File tree

1 file changed

+6
-6
lines changed
  • server/src/main/java/org/elasticsearch/node

1 file changed

+6
-6
lines changed

server/src/main/java/org/elasticsearch/node/Node.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,10 @@ public Node start() throws NodeValidationException {
286286
injector.getInstance(RepositoriesService.class).start();
287287
injector.getInstance(SearchService.class).start();
288288
injector.getInstance(FsHealthService.class).start();
289+
injector.getInstance(NodeMetrics.class).start();
290+
injector.getInstance(IndicesMetrics.class).start();
291+
injector.getInstance(HealthPeriodicLogger.class).start();
292+
injector.getInstance(SamplingService.class).start();
289293
nodeService.getMonitorService().start();
290294

291295
final ClusterService clusterService = injector.getInstance(ClusterService.class);
@@ -405,6 +409,8 @@ public void onTimeout(TimeValue timeout) {
405409
}
406410
}
407411

412+
// ------- DO NOT ADD NEW START CALLS BELOW HERE -------
413+
408414
injector.getInstance(HttpServerTransport.class).start();
409415
if (ReadinessService.enabled(environment)) {
410416
injector.getInstance(ReadinessService.class).start();
@@ -425,12 +431,6 @@ public void onTimeout(TimeValue timeout) {
425431
writePortsFile("remote_cluster", transport.boundRemoteAccessAddress());
426432
}
427433
}
428-
429-
injector.getInstance(NodeMetrics.class).start();
430-
injector.getInstance(IndicesMetrics.class).start();
431-
injector.getInstance(HealthPeriodicLogger.class).start();
432-
injector.getInstance(SamplingService.class).start();
433-
434434
logger.info("started {}", transportService.getLocalNode());
435435

436436
pluginsService.filterPlugins(ClusterPlugin.class).forEach(ClusterPlugin::onNodeStarted);

0 commit comments

Comments
 (0)