Skip to content

Commit 5479207

Browse files
authored
Prepare transport version backport to 9.0 for RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE (#125095)
Relates to #123859
1 parent fd51f44 commit 5479207

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ static TransportVersion def(int id) {
156156
public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR_9_0 = def(9_000_0_05);
157157
public static final TransportVersion BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_90 = def(9_000_0_06);
158158
public static final TransportVersion RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR_90 = def(9_000_0_07);
159+
public static final TransportVersion RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE_90 = def(9_000_0_08);
159160
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_001_0_00);
160161
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES = def(9_002_0_00);
161162
public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED = def(9_003_0_00);

server/src/main/java/org/elasticsearch/action/search/SearchRequest.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,8 @@ public SearchRequest(StreamInput in) throws IOException {
253253
finalReduce = true;
254254
}
255255
ccsMinimizeRoundtrips = in.readBoolean();
256-
if (in.getTransportVersion().before(TransportVersions.RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE) && in.readBoolean()) {
256+
if ((in.getTransportVersion().isPatchFrom(TransportVersions.RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE_90) == false
257+
&& in.getTransportVersion().before(TransportVersions.RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE)) && in.readBoolean()) {
257258
Version.readVersion(in); // and drop on the floor
258259
}
259260
waitForCheckpoints = in.readMap(StreamInput::readLongArray);
@@ -290,7 +291,8 @@ public void writeTo(StreamOutput out) throws IOException {
290291
out.writeBoolean(finalReduce);
291292
}
292293
out.writeBoolean(ccsMinimizeRoundtrips);
293-
if (out.getTransportVersion().before(TransportVersions.RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE)) {
294+
if ((out.getTransportVersion().isPatchFrom(TransportVersions.RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE_90) == false
295+
&& out.getTransportVersion().before(TransportVersions.RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE))) {
294296
out.writeBoolean(false);
295297
}
296298
out.writeMap(waitForCheckpoints, StreamOutput::writeLongArray);

0 commit comments

Comments
 (0)