Skip to content

Commit 32ddbb3

Browse files
thecoopthecoop
authored
Squash transport versions into 8.15 (#114827)
1 parent 64ae0ae commit 32ddbb3

File tree

127 files changed

+254
-345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+254
-345
lines changed

‎modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpTaskState.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@
4444
public class GeoIpTaskState implements PersistentTaskState, VersionedNamedWriteable {
4545

4646
private static boolean includeSha256(TransportVersion version) {
47-
return version.isPatchFrom(TransportVersions.ENTERPRISE_GEOIP_DOWNLOADER_BACKPORT_8_15)
48-
|| version.onOrAfter(TransportVersions.ENTERPRISE_GEOIP_DOWNLOADER);
47+
return version.isPatchFrom(TransportVersions.V_8_15_0) || version.onOrAfter(TransportVersions.ENTERPRISE_GEOIP_DOWNLOADER);
4948
}
5049

5150
private static final ParseField DATABASES = new ParseField("databases");

‎server/src/internalClusterTest/java/org/elasticsearch/search/rank/FieldBasedRerankerIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public String getWriteableName() {
234234

235235
@Override
236236
public TransportVersion getMinimalSupportedVersion() {
237-
return TransportVersions.RANK_FEATURE_PHASE_ADDED;
237+
return TransportVersions.V_8_15_0;
238238
}
239239
}
240240

‎server/src/internalClusterTest/java/org/elasticsearch/search/rank/MockedRequestActionBasedRerankerIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ public String getWriteableName() {
424424

425425
@Override
426426
public TransportVersion getMinimalSupportedVersion() {
427-
return TransportVersions.RANK_FEATURE_PHASE_ADDED;
427+
return TransportVersions.V_8_15_0;
428428
}
429429
}
430430

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1917,7 +1917,7 @@ private enum ElasticsearchExceptionHandle {
19171917
ResourceAlreadyUploadedException.class,
19181918
ResourceAlreadyUploadedException::new,
19191919
181,
1920-
TransportVersions.ADD_RESOURCE_ALREADY_UPLOADED_EXCEPTION
1920+
TransportVersions.V_8_15_0
19211921
),
19221922
INGEST_PIPELINE_EXCEPTION(
19231923
org.elasticsearch.ingest.IngestPipelineException.class,

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

Lines changed: 3 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -102,80 +102,8 @@ static TransportVersion def(int id) {
102102
public static final TransportVersion V_8_13_0 = def(8_595_00_0);
103103
public static final TransportVersion V_8_13_4 = def(8_595_00_1);
104104
public static final TransportVersion V_8_14_0 = def(8_636_00_1);
105-
// 8.15.0+
106-
public static final TransportVersion WATERMARK_THRESHOLDS_STATS = def(8_637_00_0);
107-
public static final TransportVersion ENRICH_CACHE_ADDITIONAL_STATS = def(8_638_00_0);
108-
public static final TransportVersion ML_INFERENCE_RATE_LIMIT_SETTINGS_ADDED = def(8_639_00_0);
109-
public static final TransportVersion ML_TRAINED_MODEL_CACHE_METADATA_ADDED = def(8_640_00_0);
110-
public static final TransportVersion TOP_LEVEL_KNN_SUPPORT_QUERY_NAME = def(8_641_00_0);
111-
public static final TransportVersion INDEX_SEGMENTS_VECTOR_FORMATS = def(8_642_00_0);
112-
public static final TransportVersion ADD_RESOURCE_ALREADY_UPLOADED_EXCEPTION = def(8_643_00_0);
113-
public static final TransportVersion ESQL_MV_ORDERING_SORTED_ASCENDING = def(8_644_00_0);
114-
public static final TransportVersion ESQL_PAGE_MAPPING_TO_ITERATOR = def(8_645_00_0);
115-
public static final TransportVersion BINARY_PIT_ID = def(8_646_00_0);
116-
public static final TransportVersion SECURITY_ROLE_MAPPINGS_IN_CLUSTER_STATE = def(8_647_00_0);
117-
public static final TransportVersion ESQL_REQUEST_TABLES = def(8_648_00_0);
118-
public static final TransportVersion ROLE_REMOTE_CLUSTER_PRIVS = def(8_649_00_0);
119-
public static final TransportVersion NO_GLOBAL_RETENTION_FOR_SYSTEM_DATA_STREAMS = def(8_650_00_0);
120-
public static final TransportVersion SHUTDOWN_REQUEST_TIMEOUTS_FIX = def(8_651_00_0);
121-
public static final TransportVersion INDEXING_PRESSURE_REQUEST_REJECTIONS_COUNT = def(8_652_00_0);
122-
public static final TransportVersion ROLLUP_USAGE = def(8_653_00_0);
123-
public static final TransportVersion SECURITY_ROLE_DESCRIPTION = def(8_654_00_0);
124-
public static final TransportVersion ML_INFERENCE_AZURE_OPENAI_COMPLETIONS = def(8_655_00_0);
125-
public static final TransportVersion JOIN_STATUS_AGE_SERIALIZATION = def(8_656_00_0);
126-
public static final TransportVersion ML_RERANK_DOC_OPTIONAL = def(8_657_00_0);
127-
public static final TransportVersion FAILURE_STORE_FIELD_PARITY = def(8_658_00_0);
128-
public static final TransportVersion ML_INFERENCE_AZURE_AI_STUDIO = def(8_659_00_0);
129-
public static final TransportVersion ML_INFERENCE_COHERE_COMPLETION_ADDED = def(8_660_00_0);
130-
public static final TransportVersion ESQL_REMOVE_ES_SOURCE_OPTIONS = def(8_661_00_0);
131-
public static final TransportVersion NODE_STATS_INGEST_BYTES = def(8_662_00_0);
132-
public static final TransportVersion SEMANTIC_QUERY = def(8_663_00_0);
133-
public static final TransportVersion GET_AUTOSCALING_CAPACITY_UNUSED_TIMEOUT = def(8_664_00_0);
134-
public static final TransportVersion SIMULATE_VALIDATES_MAPPINGS = def(8_665_00_0);
135-
public static final TransportVersion RULE_QUERY_RENAME = def(8_666_00_0);
136-
public static final TransportVersion SPARSE_VECTOR_QUERY_ADDED = def(8_667_00_0);
137-
public static final TransportVersion ESQL_ADD_INDEX_MODE_TO_SOURCE = def(8_668_00_0);
138-
public static final TransportVersion GET_SHUTDOWN_STATUS_TIMEOUT = def(8_669_00_0);
139-
public static final TransportVersion FAILURE_STORE_TELEMETRY = def(8_670_00_0);
140-
public static final TransportVersion ADD_METADATA_FLATTENED_TO_ROLES = def(8_671_00_0);
141-
public static final TransportVersion ML_INFERENCE_GOOGLE_AI_STUDIO_COMPLETION_ADDED = def(8_672_00_0);
142-
public static final TransportVersion WATCHER_REQUEST_TIMEOUTS = def(8_673_00_0);
143-
public static final TransportVersion ML_INFERENCE_ENHANCE_DELETE_ENDPOINT = def(8_674_00_0);
144-
public static final TransportVersion ML_INFERENCE_GOOGLE_AI_STUDIO_EMBEDDINGS_ADDED = def(8_675_00_0);
145-
public static final TransportVersion ADD_MISTRAL_EMBEDDINGS_INFERENCE = def(8_676_00_0);
146-
public static final TransportVersion ML_CHUNK_INFERENCE_OPTION = def(8_677_00_0);
147-
public static final TransportVersion RANK_FEATURE_PHASE_ADDED = def(8_678_00_0);
148-
public static final TransportVersion RANK_DOC_IN_SHARD_FETCH_REQUEST = def(8_679_00_0);
149-
public static final TransportVersion SECURITY_SETTINGS_REQUEST_TIMEOUTS = def(8_680_00_0);
150-
public static final TransportVersion QUERY_RULE_CRUD_API_PUT = def(8_681_00_0);
151-
public static final TransportVersion DROP_UNUSED_NODES_REQUESTS = def(8_682_00_0);
152-
public static final TransportVersion QUERY_RULE_CRUD_API_GET_DELETE = def(8_683_00_0);
153-
public static final TransportVersion MORE_LIGHTER_NODES_REQUESTS = def(8_684_00_0);
154-
public static final TransportVersion DROP_UNUSED_NODES_IDS = def(8_685_00_0);
155-
public static final TransportVersion DELETE_SNAPSHOTS_ASYNC_ADDED = def(8_686_00_0);
156-
public static final TransportVersion VERSION_SUPPORTING_SPARSE_VECTOR_STATS = def(8_687_00_0);
157-
public static final TransportVersion ML_AD_OUTPUT_MEMORY_ALLOCATOR_FIELD = def(8_688_00_0);
158-
public static final TransportVersion FAILURE_STORE_LAZY_CREATION = def(8_689_00_0);
159-
public static final TransportVersion SNAPSHOT_REQUEST_TIMEOUTS = def(8_690_00_0);
160-
public static final TransportVersion INDEX_METADATA_MAPPINGS_UPDATED_VERSION = def(8_691_00_0);
161-
public static final TransportVersion ML_INFERENCE_ELAND_SETTINGS_ADDED = def(8_692_00_0);
162-
public static final TransportVersion ML_ANTHROPIC_INTEGRATION_ADDED = def(8_693_00_0);
163-
public static final TransportVersion ML_INFERENCE_GOOGLE_VERTEX_AI_EMBEDDINGS_ADDED = def(8_694_00_0);
164-
public static final TransportVersion EVENT_INGESTED_RANGE_IN_CLUSTER_STATE = def(8_695_00_0);
165-
public static final TransportVersion ESQL_ADD_AGGREGATE_TYPE = def(8_696_00_0);
166-
public static final TransportVersion SECURITY_MIGRATIONS_MIGRATION_NEEDED_ADDED = def(8_697_00_0);
167-
public static final TransportVersion K_FOR_KNN_QUERY_ADDED = def(8_698_00_0);
168-
public static final TransportVersion TEXT_SIMILARITY_RERANKER_RETRIEVER = def(8_699_00_0);
169-
public static final TransportVersion ML_INFERENCE_GOOGLE_VERTEX_AI_RERANKING_ADDED = def(8_700_00_0);
170-
public static final TransportVersion VERSIONED_MASTER_NODE_REQUESTS = def(8_701_00_0);
171-
public static final TransportVersion ML_INFERENCE_AMAZON_BEDROCK_ADDED = def(8_702_00_0);
172-
public static final TransportVersion ENTERPRISE_GEOIP_DOWNLOADER_BACKPORT_8_15 = def(8_702_00_1);
173-
public static final TransportVersion FIX_VECTOR_SIMILARITY_INNER_HITS_BACKPORT_8_15 = def(8_702_00_2);
174-
/**
175-
* we made a single backport for ESQL_ES_FIELD_CACHED_SERIALIZATION and ESQL_ATTRIBUTE_CACHED_SERIALIZATION
176-
* with only one TransportVersion entry
177-
*/
178-
public static final TransportVersion ESQL_ATTRIBUTE_CACHED_SERIALIZATION_8_15 = def(8_702_00_3);
105+
public static final TransportVersion V_8_15_0 = def(8_702_00_2);
106+
public static final TransportVersion V_8_15_2 = def(8_702_00_3);
179107
public static final TransportVersion ML_INFERENCE_DONT_DELETE_WHEN_SEMANTIC_TEXT_EXISTS = def(8_703_00_0);
180108
public static final TransportVersion INFERENCE_ADAPTIVE_ALLOCATIONS = def(8_704_00_0);
181109
public static final TransportVersion INDEX_REQUEST_UPDATE_BY_SCRIPT_ORIGIN = def(8_705_00_0);
@@ -313,7 +241,7 @@ static TransportVersion def(int id) {
313241
* Reference to the minimum transport version that can be used with CCS.
314242
* This should be the transport version used by the previous minor release.
315243
*/
316-
public static final TransportVersion MINIMUM_CCS_VERSION = FIX_VECTOR_SIMILARITY_INNER_HITS_BACKPORT_8_15;
244+
public static final TransportVersion MINIMUM_CCS_VERSION = V_8_15_0;
317245

318246
static final NavigableMap<Integer, TransportVersion> VERSION_IDS = getAllVersionIds(TransportVersions.class);
319247

‎server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public Response(Map<String, NodeAllocationStats> nodeAllocationStats, DiskThresh
156156
public Response(StreamInput in) throws IOException {
157157
super(in);
158158
this.nodeAllocationStats = in.readImmutableMap(StreamInput::readString, NodeAllocationStats::new);
159-
if (in.getTransportVersion().onOrAfter(TransportVersions.WATERMARK_THRESHOLDS_STATS)) {
159+
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
160160
this.diskThresholdSettings = in.readOptionalWriteable(DiskThresholdSettings::readFrom);
161161
} else {
162162
this.diskThresholdSettings = null;
@@ -166,7 +166,7 @@ public Response(StreamInput in) throws IOException {
166166
@Override
167167
public void writeTo(StreamOutput out) throws IOException {
168168
out.writeMap(nodeAllocationStats, StreamOutput::writeString, StreamOutput::writeWriteable);
169-
if (out.getTransportVersion().onOrAfter(TransportVersions.WATERMARK_THRESHOLDS_STATS)) {
169+
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
170170
out.writeOptionalWriteable(diskThresholdSettings);
171171
} else {
172172
assert diskThresholdSettings == null;

‎server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,7 @@ public static class NodeStatsRequest extends TransportRequest {
186186
public NodeStatsRequest(StreamInput in) throws IOException {
187187
super(in);
188188
this.nodesStatsRequestParameters = new NodesStatsRequestParameters(in);
189-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)
190-
&& in.getTransportVersion().before(TransportVersions.DROP_UNUSED_NODES_IDS)) {
189+
if (in.getTransportVersion().between(TransportVersions.V_8_13_0, TransportVersions.V_8_15_0)) {
191190
in.readStringArray(); // formerly nodeIds, now unused
192191
}
193192
}
@@ -214,8 +213,7 @@ public String getDescription() {
214213
public void writeTo(StreamOutput out) throws IOException {
215214
super.writeTo(out);
216215
nodesStatsRequestParameters.writeTo(out);
217-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)
218-
&& out.getTransportVersion().before(TransportVersions.DROP_UNUSED_NODES_IDS)) {
216+
if (out.getTransportVersion().between(TransportVersions.V_8_13_0, TransportVersions.V_8_15_0)) {
219217
out.writeStringArray(Strings.EMPTY_ARRAY); // formerly nodeIds, now unused
220218
}
221219
}

‎server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/CleanupRepositoryRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public CleanupRepositoryRequest(TimeValue masterNodeTimeout, TimeValue ackTimeou
2929
}
3030

3131
public static CleanupRepositoryRequest readFrom(StreamInput in) throws IOException {
32-
if (in.getTransportVersion().onOrAfter(TransportVersions.SNAPSHOT_REQUEST_TIMEOUTS)) {
32+
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
3333
return new CleanupRepositoryRequest(in);
3434
} else {
3535
return new CleanupRepositoryRequest(TimeValue.THIRTY_SECONDS, TimeValue.THIRTY_SECONDS, in);
@@ -48,7 +48,7 @@ public CleanupRepositoryRequest(TimeValue masterNodeTimeout, TimeValue ackTimeou
4848

4949
@Override
5050
public void writeTo(StreamOutput out) throws IOException {
51-
if (out.getTransportVersion().onOrAfter(TransportVersions.SNAPSHOT_REQUEST_TIMEOUTS)) {
51+
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
5252
super.writeTo(out);
5353
}
5454
out.writeString(repository);

‎server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public DeleteSnapshotRequest(StreamInput in) throws IOException {
5151
super(in);
5252
repository = in.readString();
5353
snapshots = in.readStringArray();
54-
if (in.getTransportVersion().onOrAfter(TransportVersions.DELETE_SNAPSHOTS_ASYNC_ADDED)) {
54+
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
5555
waitForCompletion = in.readBoolean();
5656
}
5757
}
@@ -61,7 +61,7 @@ public void writeTo(StreamOutput out) throws IOException {
6161
super.writeTo(out);
6262
out.writeString(repository);
6363
out.writeStringArray(snapshots);
64-
if (out.getTransportVersion().onOrAfter(TransportVersions.DELETE_SNAPSHOTS_ASYNC_ADDED)) {
64+
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
6565
out.writeBoolean(waitForCompletion);
6666
} else {
6767
assert waitForCompletion : "Using wait_for_completion parameter when it should have been disallowed";

‎server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ protected ClusterBlockException checkBlock(DeleteSnapshotRequest request, Cluste
6464

6565
@Override
6666
protected void doExecute(Task task, DeleteSnapshotRequest request, ActionListener<AcknowledgedResponse> listener) {
67-
if (clusterService.state().getMinTransportVersion().before(TransportVersions.DELETE_SNAPSHOTS_ASYNC_ADDED)
68-
&& request.waitForCompletion() == false) {
67+
if (clusterService.state().getMinTransportVersion().before(TransportVersions.V_8_15_0) && request.waitForCompletion() == false) {
6968
throw new UnsupportedOperationException("wait_for_completion parameter is not supported by all nodes in this cluster");
7069
}
7170
super.doExecute(task, request, listener);

0 commit comments

Comments
 (0)