fix

idegtiarenko · idegtiarenko · commit cff6ddb60a90 · 2025-05-14T10:44:58.000+02:00
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/DataNodeRequestSender.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/DataNodeRequestSender.java
@@ -203,7 +203,8 @@ private void trySendingRequestsForPendingShards(TargetShards targetShards, Compu
                         }
                     }
                     for (ShardId shardId : pendingShardIds) {
-                        if (targetShards.getShard(shardId).remainingNodes.isEmpty()) {
+                        if (targetShards.getShard(shardId).remainingNodes.isEmpty()
+                            && (isRetryableFailure(shardFailures.get(shardId)) == false || pendingRetries.contains(shardId))) {
                             shardFailures.compute(
                                 shardId,
                                 (k, v) -> new ShardFailure(

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,8 @@ private void trySendingRequestsForPendingShards(TargetShards targetShards, Compu`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`	`for (ShardId shardId : pendingShardIds) {`
`206`		`- if (targetShards.getShard(shardId).remainingNodes.isEmpty()) {`
	`206`	`+ if (targetShards.getShard(shardId).remainingNodes.isEmpty()`
	`207`	`+ && (isRetryableFailure(shardFailures.get(shardId)) == false \|\| pendingRetries.contains(shardId))) {`
`207`	`208`	`shardFailures.compute(`
`208`	`209`	`shardId,`
`209`	`210`	`(k, v) -> new ShardFailure(`