Skip to content

Commit b2a66a2

Browse files
committed
do not erase prior shard failures on skipping node
1 parent 8c55e8a commit b2a66a2

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/DataNodeComputeHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ protected void sendRequest(
113113
NodeListener nodeListener
114114
) {
115115
if (exchangeSource.isFinished()) {
116-
nodeListener.onResponse(new DataNodeComputeResponse(List.of(), Map.of()));
116+
nodeListener.onSkip();
117117
return;
118118
}
119119

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/DataNodeRequestSender.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,11 @@ public void onFailure(Exception e, boolean receivedData) {
199199
}
200200
onAfter(List.of());
201201
}
202+
203+
@Override
204+
public void onSkip() {
205+
onAfter(List.of());
206+
}
202207
});
203208
}
204209

@@ -208,6 +213,8 @@ interface NodeListener {
208213
void onResponse(DataNodeComputeResponse response);
209214

210215
void onFailure(Exception e, boolean receivedData);
216+
217+
void onSkip();
211218
}
212219

213220
private static Exception unwrapFailure(Exception e) {

0 commit comments

Comments
 (0)