Skip to content

Fix incorrect mutex used in QueryPhaseResultConsumer #116171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 4, 2024
Merged

Fix incorrect mutex used in QueryPhaseResultConsumer #116171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bbb0cb
Fix incorrect mutex used in QueryPhaseResultConsumer
original-brownbear Nov 4, 2024
a05a6f8
urgh :)
original-brownbear Nov 4, 2024
bab3c33
Merge remote-tracking branch 'elastic/main' into fix-bunch-of-tests
original-brownbear Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,6 @@ tests:
- class: org.elasticsearch.search.functionscore.QueryRescorerIT
method: testScoring
issue: https://github.com/elastic/elasticsearch/issues/116050
- class: org.elasticsearch.indexing.IndexActionIT
method: testAutoGenerateIdNoDuplicates
issue: https://github.com/elastic/elasticsearch/issues/115716
- class: org.elasticsearch.xpack.application.connector.ConnectorIndexServiceTests
issue: https://github.com/elastic/elasticsearch/issues/116087
- class: org.elasticsearch.compute.operator.FilterOperatorTests
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ protected void doRun() {
onMergeFailure(t);
return;
}
synchronized (QueryPhaseResultConsumer.this) {
synchronized (QueryPhaseResultConsumer.PendingMerges.this) {
if (hasFailure()) {
return;
}
Expand All @@ -501,7 +501,7 @@ protected void doRun() {
}
}
Runnable r = mergeTask.consumeListener();
synchronized (QueryPhaseResultConsumer.this) {
synchronized (QueryPhaseResultConsumer.PendingMerges.this) {
while (true) {
mergeTask = queue.poll();
runningTask.set(mergeTask);
Expand Down