Skip to content

Commit 8cd1558

Browse files
jdconradjdconrad
committed
Migrate transport versions 8841_015 through 8841_011
1 parent d0f1740 commit 8cd1558

File tree

14 files changed

+64
-69
lines changed

14 files changed

+64
-69
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,6 @@ static TransportVersion def(int id) {
156156
public static final TransportVersion INFERENCE_CONTEXT_8_X = def(8_841_0_08);
157157
public static final TransportVersion ML_INFERENCE_DEEPSEEK_8_19 = def(8_841_0_09);
158158
public static final TransportVersion ESQL_SERIALIZE_BLOCK_TYPE_CODE_8_19 = def(8_841_0_10);
159-
public static final TransportVersion ESQL_FAILURE_FROM_REMOTE_8_19 = def(8_841_0_11);
160-
public static final TransportVersion ESQL_AGGREGATE_METRIC_DOUBLE_LITERAL_8_19 = def(8_841_0_12);
161-
public static final TransportVersion INFERENCE_MODEL_REGISTRY_METADATA_8_19 = def(8_841_0_13);
162-
public static final TransportVersion INTRODUCE_LIFECYCLE_TEMPLATE_8_19 = def(8_841_0_14);
163-
public static final TransportVersion RERANK_COMMON_OPTIONS_ADDED_8_19 = def(8_841_0_15);
164159
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_001_0_00);
165160
public static final TransportVersion ESQL_RETRY_ON_SHARD_LEVEL_FAILURE = def(9_006_0_00);
166161
public static final TransportVersion ESQL_PROFILE_ASYNC_NANOS = def(9_007_00_0);
@@ -179,14 +174,9 @@ static TransportVersion def(int id) {
179174
public static final TransportVersion ESQL_THREAD_NAME_IN_DRIVER_PROFILE = def(9_027_0_00);
180175
public static final TransportVersion INFERENCE_CONTEXT = def(9_028_0_00);
181176
public static final TransportVersion ML_INFERENCE_DEEPSEEK = def(9_029_00_0);
182-
public static final TransportVersion ESQL_FAILURE_FROM_REMOTE = def(9_030_00_0);
183177
public static final TransportVersion INDEX_RESHARDING_METADATA = def(9_031_0_00);
184-
public static final TransportVersion INFERENCE_MODEL_REGISTRY_METADATA = def(9_032_0_00);
185-
public static final TransportVersion INTRODUCE_LIFECYCLE_TEMPLATE = def(9_033_0_00);
186178
public static final TransportVersion INDEXING_STATS_INCLUDES_RECENT_WRITE_LOAD = def(9_034_0_00);
187-
public static final TransportVersion ESQL_AGGREGATE_METRIC_DOUBLE_LITERAL = def(9_035_0_00);
188179
public static final TransportVersion INDEX_METADATA_INCLUDES_RECENT_WRITE_LOAD = def(9_036_0_00);
189-
public static final TransportVersion RERANK_COMMON_OPTIONS_ADDED = def(9_037_0_00);
190180
public static final TransportVersion PROJECT_ID_IN_SNAPSHOT = def(9_040_0_00);
191181
public static final TransportVersion INDEX_STATS_AND_METADATA_INCLUDE_PEAK_WRITE_LOAD = def(9_041_0_00);
192182
public static final TransportVersion ESQL_REMOVE_AGGREGATE_TYPE = def(9_045_0_00);

‎server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ public class DataStreamLifecycle implements SimpleDiffable<DataStreamLifecycle>,
7373
private static final String DOWNSAMPLING_NOT_SUPPORTED_ERROR_MESSAGE =
7474
"Failure store lifecycle does not support downsampling, please remove the downsampling configuration.";
7575

76+
private static final TransportVersion INTRODUCE_LIFECYCLE_TEMPLATE = TransportVersion.fromName("introduce_lifecycle_template");
77+
7678
/**
7779
* Check if {@link #DATA_STREAMS_LIFECYCLE_ONLY_SETTING_NAME} is present and set to {@code true}, indicating that
7880
* we're running in a cluster configuration that is only expecting to use data streams lifecycles.
@@ -329,17 +331,15 @@ public int hashCode() {
329331
@Override
330332
public void writeTo(StreamOutput out) throws IOException {
331333
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
332-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
333-
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
334+
if (out.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) {
334335
out.writeOptionalTimeValue(dataRetention);
335336
} else {
336337
writeLegacyOptionalValue(dataRetention, out, StreamOutput::writeTimeValue);
337338
}
338339

339340
}
340341
if (out.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) {
341-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
342-
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
342+
if (out.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) {
343343
out.writeOptionalCollection(downsampling);
344344
} else {
345345
writeLegacyOptionalValue(downsampling, out, StreamOutput::writeCollection);
@@ -353,8 +353,7 @@ public void writeTo(StreamOutput out) throws IOException {
353353

354354
public DataStreamLifecycle(StreamInput in) throws IOException {
355355
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
356-
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
357-
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
356+
if (in.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) {
358357
dataRetention = in.readOptionalTimeValue();
359358
} else {
360359
dataRetention = readLegacyOptionalValue(in, StreamInput::readTimeValue);
@@ -363,8 +362,7 @@ public DataStreamLifecycle(StreamInput in) throws IOException {
363362
dataRetention = null;
364363
}
365364
if (in.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) {
366-
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
367-
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
365+
if (in.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) {
368366
downsampling = in.readOptionalCollectionAsList(DownsamplingRound::read);
369367
} else {
370368
downsampling = readLegacyOptionalValue(in, is -> is.readCollectionAsList(DownsamplingRound::read));
@@ -721,16 +719,14 @@ public record Template(
721719
public void writeTo(StreamOutput out) throws IOException {
722720
// The order of the fields is like this for bwc reasons
723721
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
724-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
725-
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
722+
if (out.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) {
726723
ResettableValue.write(out, dataRetention, StreamOutput::writeTimeValue);
727724
} else {
728725
writeLegacyValue(out, dataRetention, StreamOutput::writeTimeValue);
729726
}
730727
}
731728
if (out.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) {
732-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
733-
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
729+
if (out.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) {
734730
ResettableValue.write(out, downsampling, StreamOutput::writeCollection);
735731
} else {
736732
writeLegacyValue(out, downsampling, StreamOutput::writeCollection);
@@ -783,16 +779,14 @@ public static Template read(StreamInput in) throws IOException {
783779

784780
// The order of the fields is like this for bwc reasons
785781
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
786-
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
787-
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
782+
if (in.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) {
788783
dataRetention = ResettableValue.read(in, StreamInput::readTimeValue);
789784
} else {
790785
dataRetention = readLegacyValues(in, StreamInput::readTimeValue);
791786
}
792787
}
793788
if (in.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) {
794-
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
795-
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
789+
if (in.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) {
796790
downsampling = ResettableValue.read(in, i -> i.readCollectionAsList(DownsamplingRound::read));
797791
} else {
798792
downsampling = readLegacyValues(in, i -> i.readCollectionAsList(DownsamplingRound::read));

‎server/src/main/java/org/elasticsearch/inference/MinimalServiceSettings.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.elasticsearch.inference;
1111

1212
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.cluster.Diff;
1514
import org.elasticsearch.cluster.SimpleDiffable;
1615
import org.elasticsearch.common.io.stream.StreamInput;
@@ -26,8 +25,6 @@
2625
import java.io.IOException;
2726
import java.util.Objects;
2827

29-
import static org.elasticsearch.TransportVersions.INFERENCE_MODEL_REGISTRY_METADATA;
30-
import static org.elasticsearch.TransportVersions.INFERENCE_MODEL_REGISTRY_METADATA_8_19;
3128
import static org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper.ElementType;
3229
import static org.elasticsearch.inference.TaskType.CHAT_COMPLETION;
3330
import static org.elasticsearch.inference.TaskType.COMPLETION;
@@ -97,6 +94,10 @@ public static MinimalServiceSettings parse(XContentParser parser) throws IOExcep
9794
return PARSER.parse(parser, null);
9895
}
9996

97+
private static final TransportVersion INFERENCE_MODEL_REGISTRY_METADATA = TransportVersion.fromName(
98+
"inference_model_registry_metadata"
99+
);
100+
100101
public static MinimalServiceSettings textEmbedding(
101102
String serviceName,
102103
int dimensions,
@@ -163,12 +164,12 @@ public String getWriteableName() {
163164

164165
@Override
165166
public TransportVersion getMinimalSupportedVersion() {
166-
return TransportVersions.INFERENCE_MODEL_REGISTRY_METADATA_8_19;
167+
return INFERENCE_MODEL_REGISTRY_METADATA;
167168
}
168169

169170
@Override
170171
public boolean supportsVersion(TransportVersion version) {
171-
return version.isPatchFrom(INFERENCE_MODEL_REGISTRY_METADATA_8_19) || version.onOrAfter(INFERENCE_MODEL_REGISTRY_METADATA);
172+
return version.supports(INFERENCE_MODEL_REGISTRY_METADATA);
172173
}
173174

174175
@Override

‎server/src/main/resources/transport/definitions/referable/esql_aggregate_metric_double_literal.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9035000,8841012

‎server/src/main/resources/transport/definitions/referable/esql_failure_from_remote.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9030000,8841011

‎server/src/main/resources/transport/definitions/referable/inference_model_registry_metadata.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9032000,8841013

‎server/src/main/resources/transport/definitions/referable/introduce_lifecycle_template.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9033000,8841014

‎server/src/main/resources/transport/definitions/referable/rerank_common_options_added.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9037000,8841015

‎server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.elasticsearch.cluster.metadata;
1111

1212
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.action.admin.indices.rollover.MaxAgeCondition;
1514
import org.elasticsearch.action.admin.indices.rollover.MaxDocsCondition;
1615
import org.elasticsearch.action.admin.indices.rollover.MaxPrimaryShardDocsCondition;
@@ -67,6 +66,8 @@
6766

6867
public class IndexMetadataTests extends ESTestCase {
6968

69+
private static final TransportVersion ESQL_FAILURE_FROM_REMOTE = TransportVersion.fromName("esql_failure_from_remote");
70+
7071
@Before
7172
public void setUp() throws Exception {
7273
super.setUp();
@@ -687,7 +688,7 @@ public void testReshardingBWCSerialization() throws IOException {
687688
IndexMetadata idx = IndexMetadata.builder("test").settings(settings).reshardingMetadata(reshardingMetadata).build();
688689

689690
// the version prior to TransportVersions.INDEX_RESHARDING_METADATA
690-
final var version = TransportVersions.ESQL_FAILURE_FROM_REMOTE;
691+
final var version = ESQL_FAILURE_FROM_REMOTE;
691692
// should round trip
692693
final var deserialized = roundTripWithVersion(idx, version);
693694

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/InferenceAction.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ public static Builder parseRequest(String inferenceEntityId, TaskType taskType,
9494
return builder;
9595
}
9696

97+
private static final TransportVersion RERANK_COMMON_OPTIONS_ADDED = TransportVersion.fromName("rerank_common_options_added");
98+
9799
private final TaskType taskType;
98100
private final String inferenceEntityId;
99101
private final String query;
@@ -182,8 +184,7 @@ public Request(StreamInput in) throws IOException {
182184
this.inferenceTimeout = DEFAULT_TIMEOUT;
183185
}
184186

185-
if (in.getTransportVersion().onOrAfter(TransportVersions.RERANK_COMMON_OPTIONS_ADDED)
186-
|| in.getTransportVersion().isPatchFrom(TransportVersions.RERANK_COMMON_OPTIONS_ADDED_8_19)) {
187+
if (in.getTransportVersion().supports(RERANK_COMMON_OPTIONS_ADDED)) {
187188
this.returnDocuments = in.readOptionalBoolean();
188189
this.topN = in.readOptionalInt();
189190
} else {
@@ -313,8 +314,7 @@ public void writeTo(StreamOutput out) throws IOException {
313314
out.writeTimeValue(inferenceTimeout);
314315
}
315316

316-
if (out.getTransportVersion().onOrAfter(TransportVersions.RERANK_COMMON_OPTIONS_ADDED)
317-
|| out.getTransportVersion().isPatchFrom(TransportVersions.RERANK_COMMON_OPTIONS_ADDED_8_19)) {
317+
if (out.getTransportVersion().supports(RERANK_COMMON_OPTIONS_ADDED)) {
318318
out.writeOptionalBoolean(returnDocuments);
319319
out.writeOptionalInt(topN);
320320
}

0 commit comments

Comments
 (0)