iter

Author: piergm

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

@@ -712,9 +712,10 @@ private void construct(
         ClusterService clusterService = createClusterService(settingsModule, threadPool, taskManager);
         clusterService.addStateApplier(scriptService);
 
-        var executor = (TaskExecutionTimeTrackingPerIndexEsThreadPoolExecutor) threadPool.executor(ThreadPool.Names.SEARCH);
-        clusterService.addListener(new SearchIndexTimeTrackingCleanupService(executor));
-
+        var executor = threadPool.executor(ThreadPool.Names.SEARCH);
+        if (executor instanceof  TaskExecutionTimeTrackingPerIndexEsThreadPoolExecutor perIndexExecutor) {
+            clusterService.addListener(new SearchIndexTimeTrackingCleanupService(perIndexExecutor));
+        }
         modules.bindToInstance(DocumentParsingProvider.class, documentParsingProvider);
 
         FailureStoreMetrics failureStoreMetrics = new FailureStoreMetrics(telemetryProvider.getMeterRegistry());

server/src/main/java/org/elasticsearch/search/query/QueryPhase.java

@@ -226,7 +226,7 @@ static void addCollectorsAndSearch(SearchContext searchContext) throws QueryPhas
                 queryResult.terminatedEarly(queryPhaseResult.terminatedAfter());
             }
             ExecutorService executor = searchContext.indexShard().getThreadPool().executor(ThreadPool.Names.SEARCH);
-            assert executor instanceof TaskExecutionTimeTrackingEsThreadPoolExecutor // TODO MP check this
+            assert executor instanceof TaskExecutionTimeTrackingEsThreadPoolExecutor
                 || (executor instanceof EsThreadPoolExecutor == false /* in case thread pool is mocked out in tests */)
                 : "SEARCH threadpool should have an executor that exposes EWMA metrics, but is of type " + executor.getClass();
             if (executor instanceof TaskExecutionTimeTrackingEsThreadPoolExecutor rExecutor) {