Skip to content

Commit c01bf85

Browse files
dnhatnomricohenn
authored andcommitted
Adjust bwc for ES|QL partial failures from remote (elastic#125279)
Relates elastic#124929
1 parent 26fd5e4 commit c01bf85

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ static TransportVersion def(int id) {
149149
public static final TransportVersion INFERENCE_CONTEXT_8_X = def(8_841_0_08);
150150
public static final TransportVersion ML_INFERENCE_DEEPSEEK_8_19 = def(8_841_0_09);
151151
public static final TransportVersion ESQL_SERIALIZE_BLOCK_TYPE_CODE_8_19 = def(8_841_0_10);
152+
public static final TransportVersion ESQL_FAILURE_FROM_REMOTE_8_19 = def(8_841_0_11);
152153
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0 = def(9_000_0_00);
153154
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES_90 = def(9_000_0_01);
154155
public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED_90 = def(9_000_0_02);

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ final class ComputeResponse extends TransportResponse {
7777
this.skippedShards = 0;
7878
this.failedShards = 0;
7979
}
80-
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_FAILURE_FROM_REMOTE)) {
80+
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_FAILURE_FROM_REMOTE)
81+
|| in.getTransportVersion().isPatchFrom(TransportVersions.ESQL_FAILURE_FROM_REMOTE_8_19)) {
8182
this.failures = in.readCollectionAsImmutableList(ShardSearchFailure::readShardSearchFailure);
8283
} else {
8384
this.failures = List.of();
@@ -101,7 +102,8 @@ public void writeTo(StreamOutput out) throws IOException {
101102
out.writeVInt(skippedShards);
102103
out.writeVInt(failedShards);
103104
}
104-
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_FAILURE_FROM_REMOTE)) {
105+
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_FAILURE_FROM_REMOTE)
106+
|| out.getTransportVersion().isPatchFrom(TransportVersions.ESQL_FAILURE_FROM_REMOTE_8_19)) {
105107
out.writeCollection(failures, (o, v) -> v.writeTo(o));
106108
}
107109
}

0 commit comments

Comments
 (0)