Skip to content

[8.x] Do not retry CircuitBreakingException (#124300) #124538

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 1 commit into from
Mar 11, 2025
Merged

[8.x] Do not retry CircuitBreakingException (#124300) #124538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion .../plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/DataNodeRequestSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.elasticsearch.action.search.SearchShardsResponse;
import org.elasticsearch.action.support.TransportActions;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.breaker.CircuitBreakingException;
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
import org.elasticsearch.compute.operator.DriverProfile;
import org.elasticsearch.compute.operator.FailureCollector;
Expand Down Expand Up @@ -209,8 +210,9 @@ private static Exception unwrapFailure(Exception e) {
private void trackShardLevelFailure(ShardId shardId, boolean fatal, Exception originalEx) {
final Exception e = unwrapFailure(originalEx);
final boolean isTaskCanceledException = ExceptionsHelper.unwrap(e, TaskCancelledException.class) != null;
final boolean isCircuitBreakerException = ExceptionsHelper.unwrap(e, CircuitBreakingException.class) != null;
shardFailures.compute(shardId, (k, current) -> {
boolean mergedFatal = fatal || isTaskCanceledException;
boolean mergedFatal = fatal || isTaskCanceledException || isCircuitBreakerException;
return current == null
? new ShardFailure(mergedFatal, e)
: new ShardFailure(
Expand Down
13 changes: 13 additions & 0 deletions ...in/esql/src/test/java/org/elasticsearch/xpack/esql/plugin/DataNodeRequestSenderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.node.DiscoveryNodeUtils;
import org.elasticsearch.common.breaker.CircuitBreaker.Durability;
import org.elasticsearch.common.breaker.CircuitBreakingException;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
import org.elasticsearch.common.util.concurrent.EsExecutors;
Expand Down Expand Up @@ -271,6 +273,17 @@ public void testNonFatalFailedOnAllNodes() {
assertThat(sent.size(), equalTo(2));
}

public void testDoNotRetryCircuitBreakerException() {
var targetShards = List.of(targetShard(shard1, node1, node2));
var sent = ConcurrentCollections.newQueue();
var future = sendRequests(targetShards, false, (node, shardIds, aliasFilters, listener) -> {
sent.add(new NodeRequest(node, shardIds, aliasFilters));
runWithDelay(() -> listener.onFailure(new CircuitBreakingException("cbe", randomFrom(Durability.values())), false));
});
expectThrows(CircuitBreakingException.class, equalTo("cbe"), future::actionGet);
assertThat(sent.size(), equalTo(1));
}

static DataNodeRequestSender.TargetShard targetShard(ShardId shardId, DiscoveryNode... nodes) {
return new DataNodeRequestSender.TargetShard(shardId, new ArrayList<>(Arrays.asList(nodes)), null);
}
Expand Down