fix retry limit

idegtiarenko · idegtiarenko · commit 7780ed7f8ab2 · 2025-04-28T16:01:30.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
@@ -265,7 +265,7 @@ void onAfter(DriverCompletionInfo info) {
                     concurrentRequests.release();
                 }
 
-                if (pendingRetries.isEmpty() == false) {
+                if (sendingLock.isHeldByCurrentThread()) {
                     try {
                         var resolutions = resolveShards(pendingRetries);
                         for (var entry : resolutions.entrySet()) {

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ void onAfter(DriverCompletionInfo info) {`
`265`	`265`	`concurrentRequests.release();`
`266`	`266`	`}`
`267`	`267`
`268`		`- if (pendingRetries.isEmpty() == false) {`
	`268`	`+ if (sendingLock.isHeldByCurrentThread()) {`
`269`	`269`	`try {`
`270`	`270`	`var resolutions = resolveShards(pendingRetries);`
`271`	`271`	`for (var entry : resolutions.entrySet()) {`