Skip to content

Commit 505b0d9

Browse files
authored
refactor health service creation (#83831)
This commit extracts health service creation into a separate method in order to reduce overall service wiring method complexity
1 parent 749ad74 commit 505b0d9

File tree

1 file changed

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

1 file changed

+18
-17
lines changed

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

+18-17
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
import org.elasticsearch.gateway.GatewayService;
9797
import org.elasticsearch.gateway.MetaStateService;
9898
import org.elasticsearch.gateway.PersistedClusterStateService;
99-
import org.elasticsearch.health.HealthIndicatorService;
10099
import org.elasticsearch.health.HealthService;
101100
import org.elasticsearch.http.HttpServerTransport;
102101
import org.elasticsearch.index.IndexSettingProviders;
@@ -865,7 +864,7 @@ protected Node(
865864
metadataCreateIndexService,
866865
settingsModule.getIndexScopedSettings()
867866
);
868-
final List<PersistentTasksExecutor<?>> builtinTaskExecutors = Arrays.asList(systemIndexMigrationExecutor);
867+
final List<PersistentTasksExecutor<?>> builtinTaskExecutors = List.of(systemIndexMigrationExecutor);
869868
final List<PersistentTasksExecutor<?>> pluginTaskExectors = pluginsService.filterPlugins(PersistentTaskPlugin.class)
870869
.stream()
871870
.map(
@@ -879,10 +878,9 @@ protected Node(
879878
)
880879
.flatMap(List::stream)
881880
.collect(toList());
882-
final List<PersistentTasksExecutor<?>> allTasksExectors = Stream.of(pluginTaskExectors, builtinTaskExecutors)
883-
.flatMap(List::stream)
884-
.collect(toList());
885-
final PersistentTasksExecutorRegistry registry = new PersistentTasksExecutorRegistry(allTasksExectors);
881+
final PersistentTasksExecutorRegistry registry = new PersistentTasksExecutorRegistry(
882+
concatLists(pluginTaskExectors, builtinTaskExecutors)
883+
);
886884
final PersistentTasksClusterService persistentTasksClusterService = new PersistentTasksClusterService(
887885
settings,
888886
registry,
@@ -901,15 +899,7 @@ protected Node(
901899
clusterService.getClusterSettings()
902900
);
903901

904-
List<HealthIndicatorService> serverHealthIndicatorServices = List.of(
905-
new InstanceHasMasterHealthIndicatorService(clusterService),
906-
new RepositoryIntegrityHealthIndicatorService(clusterService)
907-
);
908-
List<HealthIndicatorService> pluginHealthIndicatorServices = pluginsService.filterPlugins(HealthPlugin.class)
909-
.stream()
910-
.flatMap(plugin -> plugin.getHealthIndicatorServices().stream())
911-
.toList();
912-
HealthService healthService = new HealthService(concatLists(serverHealthIndicatorServices, pluginHealthIndicatorServices));
902+
HealthService healthService = createHealthService(clusterService);
913903

914904
modules.add(b -> {
915905
b.bind(Node.class).toInstance(this);
@@ -1042,6 +1032,18 @@ protected Node(
10421032
}
10431033
}
10441034

1035+
private HealthService createHealthService(ClusterService clusterService) {
1036+
var serverHealthIndicatorServices = List.of(
1037+
new InstanceHasMasterHealthIndicatorService(clusterService),
1038+
new RepositoryIntegrityHealthIndicatorService(clusterService)
1039+
);
1040+
var pluginHealthIndicatorServices = pluginsService.filterPlugins(HealthPlugin.class)
1041+
.stream()
1042+
.flatMap(plugin -> plugin.getHealthIndicatorServices().stream())
1043+
.toList();
1044+
return new HealthService(concatLists(serverHealthIndicatorServices, pluginHealthIndicatorServices));
1045+
}
1046+
10451047
private RecoveryPlannerService getRecoveryPlannerService(
10461048
ThreadPool threadPool,
10471049
ClusterService clusterService,
@@ -1062,8 +1064,7 @@ private RecoveryPlannerService getRecoveryPlannerService(
10621064
threadPool,
10631065
clusterService
10641066
);
1065-
final RecoveryPlannerPlugin recoveryPlannerPlugin = recoveryPlannerPlugins.get(0);
1066-
return recoveryPlannerPlugin.createRecoveryPlannerService(shardSnapshotsService);
1067+
return recoveryPlannerPlugins.get(0).createRecoveryPlannerService(shardSnapshotsService);
10671068
}
10681069

10691070
protected TransportService newTransportService(

0 commit comments

Comments
 (0)