Skip to content

Commit 589738c

Browse files
Fix incorrect mutex used in QueryPhaseResultConsumer (#116171)
Everything synchronizes on PendingMerges, this was just a typo. closes #115716
1 parent 544750c commit 589738c

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,6 @@ tests:
223223
- class: org.elasticsearch.search.functionscore.QueryRescorerIT
224224
method: testScoring
225225
issue: https://github.com/elastic/elasticsearch/issues/116050
226-
- class: org.elasticsearch.indexing.IndexActionIT
227-
method: testAutoGenerateIdNoDuplicates
228-
issue: https://github.com/elastic/elasticsearch/issues/115716
229226
- class: org.elasticsearch.xpack.application.connector.ConnectorIndexServiceTests
230227
issue: https://github.com/elastic/elasticsearch/issues/116087
231228
- class: org.elasticsearch.compute.operator.FilterOperatorTests

server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ protected void doRun() {
480480
onMergeFailure(t);
481481
return;
482482
}
483-
synchronized (QueryPhaseResultConsumer.this) {
483+
synchronized (QueryPhaseResultConsumer.PendingMerges.this) {
484484
if (hasFailure()) {
485485
return;
486486
}
@@ -501,7 +501,7 @@ protected void doRun() {
501501
}
502502
}
503503
Runnable r = mergeTask.consumeListener();
504-
synchronized (QueryPhaseResultConsumer.this) {
504+
synchronized (QueryPhaseResultConsumer.PendingMerges.this) {
505505
while (true) {
506506
mergeTask = queue.poll();
507507
runningTask.set(mergeTask);

0 commit comments

Comments
 (0)