diff --git a/muted-tests.yml b/muted-tests.yml index c6274fc919768..f4ffdb7085cd1 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -345,9 +345,6 @@ tests: - class: org.elasticsearch.xpack.test.rest.XPackRestIT method: test {p0=transform/transforms_stats/Test get transform stats with timeout} issue: https://github.com/elastic/elasticsearch/issues/125975 -- class: org.elasticsearch.search.SearchServiceSingleNodeTests - method: testSlicingBehaviourForParallelCollection - issue: https://github.com/elastic/elasticsearch/issues/125899 - class: org.elasticsearch.packaging.test.DockerTests method: test021InstallPlugin issue: https://github.com/elastic/elasticsearch/issues/116147 diff --git a/server/src/main/java/org/elasticsearch/search/SearchService.java b/server/src/main/java/org/elasticsearch/search/SearchService.java index 0ae4d721774a5..f4e1bbd421d62 100644 --- a/server/src/main/java/org/elasticsearch/search/SearchService.java +++ b/server/src/main/java/org/elasticsearch/search/SearchService.java @@ -416,12 +416,12 @@ public SearchService( enableQueryPhaseParallelCollection = QUERY_PHASE_PARALLEL_COLLECTION_ENABLED.get(settings); if (BATCHED_QUERY_PHASE_FEATURE_FLAG) { - clusterService.getClusterSettings() - .addSettingsUpdateConsumer(QUERY_PHASE_PARALLEL_COLLECTION_ENABLED, this::setEnableQueryPhaseParallelCollection); batchQueryPhase = BATCHED_QUERY_PHASE.get(settings); } else { batchQueryPhase = false; } + clusterService.getClusterSettings() + .addSettingsUpdateConsumer(QUERY_PHASE_PARALLEL_COLLECTION_ENABLED, this::setEnableQueryPhaseParallelCollection); clusterService.getClusterSettings() .addSettingsUpdateConsumer(BATCHED_QUERY_PHASE, bulkExecuteQueryPhase -> this.batchQueryPhase = bulkExecuteQueryPhase); memoryAccountingBufferSize = MEMORY_ACCOUNTING_BUFFER_SIZE.get(settings).getBytes();