Skip to content

Commit f5d3f38

Browse files
authored
Add 9.0 patch transport version constants elastic#121985 (elastic#121986)
* Add 9.0 patch transport version constants elastic#121985 Transport version changes must be unique per branch. Some transport version changes meant for 9.0 are missing unique backport constants. This is a backport of elastic#121985, adding unique transport version patch numbers for each change intended for 9.0. * match constant naming in main
1 parent eb32a9b commit f5d3f38

File tree

6 files changed

+15
-14
lines changed

6 files changed

+15
-14
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,11 @@ static TransportVersion def(int id) {
173173
public static final TransportVersion INFERENCE_REQUEST_ADAPTIVE_RATE_LIMITING = def(8_839_0_00);
174174
public static final TransportVersion ML_INFERENCE_IBM_WATSONX_RERANK_ADDED = def(8_840_0_00);
175175
public static final TransportVersion ELASTICSEARCH_9_0 = def(9_000_0_00);
176-
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES = def(9_002_0_00);
177-
public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED = def(9_003_0_00);
178-
public static final TransportVersion REMOVE_DESIRED_NODE_VERSION = def(9_004_0_00);
179-
public static final TransportVersion ESQL_DRIVER_TASK_DESCRIPTION = def(9_005_0_00);
176+
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES_90 = def(9_000_0_01);
177+
public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED_90 = def(9_000_0_02);
178+
public static final TransportVersion REMOVE_DESIRED_NODE_VERSION_90 = def(9_000_0_03);
179+
public static final TransportVersion ESQL_DRIVER_TASK_DESCRIPTION_90 = def(9_000_0_04);
180+
180181
/*
181182
* STOP! READ THIS FIRST! No, really,
182183
* ____ _____ ___ ____ _ ____ _____ _ ____ _____ _ _ ___ ____ _____ ___ ____ ____ _____ _

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public GetSnapshotsResponse(List<SnapshotInfo> snapshots, @Nullable String next,
4949

5050
public GetSnapshotsResponse(StreamInput in) throws IOException {
5151
this.snapshots = in.readCollectionAsImmutableList(SnapshotInfo::readFrom);
52-
if (in.getTransportVersion().before(TransportVersions.REMOVE_SNAPSHOT_FAILURES)) {
52+
if (in.getTransportVersion().before(TransportVersions.REMOVE_SNAPSHOT_FAILURES_90)) {
5353
// Deprecated `failures` field
5454
in.readMap(StreamInput::readException);
5555
}
@@ -83,7 +83,7 @@ public int remaining() {
8383
@Override
8484
public void writeTo(StreamOutput out) throws IOException {
8585
out.writeCollection(snapshots);
86-
if (out.getTransportVersion().before(TransportVersions.REMOVE_SNAPSHOT_FAILURES)) {
86+
if (out.getTransportVersion().before(TransportVersions.REMOVE_SNAPSHOT_FAILURES_90)) {
8787
// Deprecated `failures` field
8888
out.writeMap(Map.of(), StreamOutput::writeException);
8989
}

server/src/main/java/org/elasticsearch/cluster/metadata/DesiredNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public static DesiredNode readFrom(StreamInput in) throws IOException {
161161
}
162162
final var memory = ByteSizeValue.readFrom(in);
163163
final var storage = ByteSizeValue.readFrom(in);
164-
if (in.getTransportVersion().before(TransportVersions.REMOVE_DESIRED_NODE_VERSION)) {
164+
if (in.getTransportVersion().before(TransportVersions.REMOVE_DESIRED_NODE_VERSION_90)) {
165165
in.readOptionalString();
166166
}
167167
return new DesiredNode(settings, processors, processorsRange, memory, storage);
@@ -180,7 +180,7 @@ public void writeTo(StreamOutput out) throws IOException {
180180
}
181181
memory.writeTo(out);
182182
storage.writeTo(out);
183-
if (out.getTransportVersion().before(TransportVersions.REMOVE_DESIRED_NODE_VERSION)) {
183+
if (out.getTransportVersion().before(TransportVersions.REMOVE_DESIRED_NODE_VERSION_90)) {
184184
out.writeOptionalString(null);
185185
}
186186
}

server/src/main/java/org/elasticsearch/transport/TransportStats.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public TransportStats(StreamInput in) throws IOException {
6969
rxSize = in.readVLong();
7070
txCount = in.readVLong();
7171
txSize = in.readVLong();
72-
if (in.getTransportVersion().before(TransportVersions.TRANSPORT_STATS_HANDLING_TIME_REQUIRED)) {
72+
if (in.getTransportVersion().before(TransportVersions.TRANSPORT_STATS_HANDLING_TIME_REQUIRED_90)) {
7373
in.readBoolean();
7474
}
7575
inboundHandlingTimeBucketFrequencies = new long[HandlingTimeTracker.BUCKET_COUNT];
@@ -98,7 +98,7 @@ public void writeTo(StreamOutput out) throws IOException {
9898
out.writeVLong(txSize);
9999
assert inboundHandlingTimeBucketFrequencies.length == HandlingTimeTracker.BUCKET_COUNT;
100100
assert outboundHandlingTimeBucketFrequencies.length == HandlingTimeTracker.BUCKET_COUNT;
101-
if (out.getTransportVersion().before(TransportVersions.TRANSPORT_STATS_HANDLING_TIME_REQUIRED)) {
101+
if (out.getTransportVersion().before(TransportVersions.TRANSPORT_STATS_HANDLING_TIME_REQUIRED_90)) {
102102
out.writeBoolean(true);
103103
}
104104
for (long handlingTimeBucketFrequency : inboundHandlingTimeBucketFrequencies) {

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/DriverProfile.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public DriverProfile(
8989
}
9090

9191
public DriverProfile(StreamInput in) throws IOException {
92-
this.taskDescription = in.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_TASK_DESCRIPTION) ? in.readString() : "";
92+
this.taskDescription = in.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_TASK_DESCRIPTION_90) ? in.readString() : "";
9393
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
9494
this.startMillis = in.readVLong();
9595
this.stopMillis = in.readVLong();
@@ -112,7 +112,7 @@ public DriverProfile(StreamInput in) throws IOException {
112112

113113
@Override
114114
public void writeTo(StreamOutput out) throws IOException {
115-
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_TASK_DESCRIPTION)) {
115+
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_TASK_DESCRIPTION_90)) {
116116
out.writeString(taskDescription);
117117
}
118118
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/DriverStatus.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public class DriverStatus implements Task.Status {
112112

113113
public DriverStatus(StreamInput in) throws IOException {
114114
this.sessionId = in.readString();
115-
this.taskDescription = in.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_TASK_DESCRIPTION) ? in.readString() : "";
115+
this.taskDescription = in.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_TASK_DESCRIPTION_90) ? in.readString() : "";
116116
this.started = in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0) ? in.readLong() : 0;
117117
this.lastUpdated = in.readLong();
118118
this.cpuNanos = in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0) ? in.readVLong() : 0;
@@ -130,7 +130,7 @@ public DriverStatus(StreamInput in) throws IOException {
130130
@Override
131131
public void writeTo(StreamOutput out) throws IOException {
132132
out.writeString(sessionId);
133-
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_TASK_DESCRIPTION)) {
133+
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_TASK_DESCRIPTION_90)) {
134134
out.writeString(taskDescription);
135135
}
136136
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) {

0 commit comments

Comments
 (0)