Skip to content

Cleanup needlessly holding Exceptions in the can_match phase #127495

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Cleanup needlessly holding Exceptions in the can_match phase #127495

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27f270a
Cleanup needlessly holding Exceptions in the can_match phase
original-brownbear Apr 29, 2025
99a702c
facepalm
original-brownbear Apr 29, 2025
3b68ca8
facepalm
original-brownbear Apr 29, 2025
ec3a8be
facepalm
original-brownbear Apr 29, 2025
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
35 changes: 17 additions & 18 deletions server/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicReferenceArray;
import java.util.function.BiFunction;

import static org.elasticsearch.core.Strings.format;
Expand Down Expand Up @@ -277,12 +278,11 @@ private Map<SendingTarget, List<SearchShardIterator>> groupByNode(List<SearchSha
private class Round extends AbstractRunnable {
private final List<SearchShardIterator> shards;
private final CountDown countDown;
private final AtomicReferenceArray<Exception> failedResponses;
private final Set<Integer> failedResponses = ConcurrentHashMap.newKeySet();

Round(List<SearchShardIterator> shards) {
this.shards = shards;
this.countDown = new CountDown(shards.size());
this.failedResponses = new AtomicReferenceArray<>(shardsIts.size());
}

@Override
Expand All @@ -296,9 +296,7 @@ protected void doRun() {

if (entry.getKey().nodeId == null) {
// no target node: just mark the requests as failed
for (CanMatchNodeRequest.Shard shard : shardLevelRequests) {
onOperationFailed(shard.getShardRequestIndex(), null);
}
onAllFailed(shardLevelRequests);
continue;
}

Expand All @@ -321,37 +319,39 @@ public void onResponse(CanMatchNodeResponse canMatchNodeResponse) {
} else {
Exception failure = response.getException();
assert failure != null;
onOperationFailed(shardLevelRequests.get(i).getShardRequestIndex(), failure);
onOperationFailed(shardLevelRequests.get(i).getShardRequestIndex());
}
}
}

@Override
public void onFailure(Exception e) {
for (CanMatchNodeRequest.Shard shard : shardLevelRequests) {
onOperationFailed(shard.getShardRequestIndex(), e);
}
onAllFailed(shardLevelRequests);
}
}
);
} catch (Exception e) {
for (CanMatchNodeRequest.Shard shard : shardLevelRequests) {
onOperationFailed(shard.getShardRequestIndex(), e);
}
onAllFailed(shardLevelRequests);
}
}
}

private void onAllFailed(List<CanMatchNodeRequest.Shard> shardLevelRequests) {
for (CanMatchNodeRequest.Shard shard : shardLevelRequests) {
onOperationFailed(shard.getShardRequestIndex());
}
}

private void onOperation(int idx, CanMatchShardResponse response) {
failedResponses.set(idx, null);
failedResponses.remove(idx);
consumeResult(response);
if (countDown.countDown()) {
finishRound();
}
}

private void onOperationFailed(int idx, Exception e) {
failedResponses.set(idx, e);
private void onOperationFailed(int idx) {
failedResponses.add(idx);
// we have to carry over shard failures in order to account for them in the response.
consumeResult(idx, true, null);
if (countDown.countDown()) {
Expand All @@ -363,8 +363,7 @@ private void finishRound() {
List<SearchShardIterator> remainingShards = new ArrayList<>();
for (SearchShardIterator ssi : shards) {
int shardIndex = shardItIndexMap.get(ssi);
Exception failedResponse = failedResponses.get(shardIndex);
if (failedResponse != null) {
if (failedResponses.contains(shardIndex)) {
remainingShards.add(ssi);
}
}
Expand Down