Skip to content

Commit e55b972

Browse files
authored
Fix failing SearchServiceSingleNodeTests testSlicingBehaviourForParallelCollection (#126300)
We need to register the settings update consumer for QUERY_PHASE_PARALLEL_COLLECTION_ENABLED regardless of the BATCHED_QUERY_PHASE_FEATURE_FLAG feature flag. Closes #125899
1 parent 1927c6e commit e55b972

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

muted-tests.yml

-3
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,6 @@ tests:
345345
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
346346
method: test {p0=transform/transforms_stats/Test get transform stats with timeout}
347347
issue: https://github.com/elastic/elasticsearch/issues/125975
348-
- class: org.elasticsearch.search.SearchServiceSingleNodeTests
349-
method: testSlicingBehaviourForParallelCollection
350-
issue: https://github.com/elastic/elasticsearch/issues/125899
351348
- class: org.elasticsearch.packaging.test.DockerTests
352349
method: test021InstallPlugin
353350
issue: https://github.com/elastic/elasticsearch/issues/116147

server/src/main/java/org/elasticsearch/search/SearchService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -416,12 +416,12 @@ public SearchService(
416416

417417
enableQueryPhaseParallelCollection = QUERY_PHASE_PARALLEL_COLLECTION_ENABLED.get(settings);
418418
if (BATCHED_QUERY_PHASE_FEATURE_FLAG) {
419-
clusterService.getClusterSettings()
420-
.addSettingsUpdateConsumer(QUERY_PHASE_PARALLEL_COLLECTION_ENABLED, this::setEnableQueryPhaseParallelCollection);
421419
batchQueryPhase = BATCHED_QUERY_PHASE.get(settings);
422420
} else {
423421
batchQueryPhase = false;
424422
}
423+
clusterService.getClusterSettings()
424+
.addSettingsUpdateConsumer(QUERY_PHASE_PARALLEL_COLLECTION_ENABLED, this::setEnableQueryPhaseParallelCollection);
425425
clusterService.getClusterSettings()
426426
.addSettingsUpdateConsumer(BATCHED_QUERY_PHASE, bulkExecuteQueryPhase -> this.batchQueryPhase = bulkExecuteQueryPhase);
427427
memoryAccountingBufferSize = MEMORY_ACCOUNTING_BUFFER_SIZE.get(settings).getBytes();

0 commit comments

Comments
 (0)