Fix node construction

carlosdelest · Oct 27, 2023 · f6088b0 · f6088b0
1 parent 7e52a49
commit f6088b0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/server/src/main/java/org/elasticsearch/node/Node.java b/server/src/main/java/org/elasticsearch/node/Node.java
@@ -59,10 +59,6 @@
 import org.elasticsearch.indices.cluster.IndicesClusterStateService;
 import org.elasticsearch.indices.recovery.PeerRecoverySourceService;
 import org.elasticsearch.indices.store.IndicesStore;
-import org.elasticsearch.inference.InferenceServiceRegistry;
-import org.elasticsearch.ingest.FieldInferenceBulkRequestPreprocessor;
-import org.elasticsearch.ingest.IngestService;
-import org.elasticsearch.monitor.MonitorService;
 import org.elasticsearch.monitor.fs.FsHealthService;
 import org.elasticsearch.monitor.jvm.JvmInfo;
 import org.elasticsearch.node.internal.TerminationHandler;

diff --git a/server/src/main/java/org/elasticsearch/node/NodeConstruction.java b/server/src/main/java/org/elasticsearch/node/NodeConstruction.java
@@ -535,10 +535,6 @@ private void construct(Environment initialEnvironment, NodeServiceProvider servi
             IngestService.createGrokThreadWatchdog(environment, threadPool),
             documentParsingObserverSupplier
         );
-        final FieldInferenceBulkRequestPreprocessor fieldInferenceBulkRequestPreprocessor = new FieldInferenceBulkRequestPreprocessor(
-            documentParsingObserverSupplier,
-            client
-        );
         final SetOnce<RepositoriesService> repositoriesServiceReference = new SetOnce<>();
         final ClusterInfoService clusterInfoService = serviceProvider.newClusterInfoService(
             pluginsService,
@@ -708,6 +704,13 @@ private void construct(Environment initialEnvironment, NodeServiceProvider servi
             searchModule.getRequestCacheKeyDifferentiator(),
             documentParsingObserverSupplier
         );
+        final FieldInferenceBulkRequestPreprocessor fieldInferenceBulkRequestPreprocessor = new FieldInferenceBulkRequestPreprocessor(
+            documentParsingObserverSupplier,
+            clusterService,
+            indicesService,
+            clusterModule.getIndexNameExpressionResolver(),
+            client
+        );
 
         final var parameters = new IndexSettingProvider.Parameters(indicesService::createIndexMapperServiceForValidation);
         IndexSettingProviders indexSettingProviders = new IndexSettingProviders(

diff --git a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java
@@ -1937,7 +1937,13 @@ protected void assertSnapshotOrGenericThread() {
                             null,
                             () -> DocumentParsingObserver.EMPTY_INSTANCE
                         ),
-                        new FieldInferenceBulkRequestPreprocessor(() -> DocumentParsingObserver.EMPTY_INSTANCE, client),
+                        new FieldInferenceBulkRequestPreprocessor(
+                            () -> DocumentParsingObserver.EMPTY_INSTANCE,
+                            clusterService,
+                            indicesService,
+                            indexNameExpressionResolver,
+                            client
+                        ),
                         client,
                         actionFilters,
                         indexNameExpressionResolver,