Skip to content

Commit e3c1c3c

Browse files
jdconradjdconrad
authored
[8.19] Roll up 8.18.0 transport versions (elastic#136651) (elastic#136722)
* Roll up 8.18.0 transport versions (elastic#136651) ES-12334 * fixes * fix missing false * fix test * fix supports
1 parent 3102597 commit e3c1c3c

File tree

78 files changed

+164
-233
lines changed

Some content is hidden

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

78 files changed

+164
-233
lines changed

‎qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/AddIndexBlockRollingUpgradeIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void testAddBlock() throws Exception {
3636
} else if (isMixedCluster()) {
3737
blockWrites();
3838
// this is used both for upgrading from 9.0.0 to current and from 8.18 to current.
39-
if (minimumTransportVersion().before(TransportVersions.ADD_INDEX_BLOCK_TWO_PHASE)) {
39+
if (minimumTransportVersion().supports(TransportVersions.V_8_18_0) == false) {
4040
assertNull(verifiedSettingValue());
4141
} else {
4242
assertThat(verifiedSettingValue(), Matchers.equalTo("true"));

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

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -135,49 +135,7 @@ static TransportVersion def(int id) {
135135
public static final TransportVersion INGEST_PIPELINE_CONFIGURATION_AS_MAP = def(8_797_0_00);
136136
public static final TransportVersion LOGSDB_TELEMETRY_CUSTOM_CUTOFF_DATE_FIX_8_17 = def(8_797_0_01);
137137
public static final TransportVersion SOURCE_MODE_TELEMETRY_FIX_8_17 = def(8_797_0_02);
138-
public static final TransportVersion INDEXING_PRESSURE_THROTTLING_STATS = def(8_798_0_00);
139-
public static final TransportVersion REINDEX_DATA_STREAMS = def(8_799_0_00);
140-
public static final TransportVersion ESQL_REMOVE_NODE_LEVEL_PLAN = def(8_800_0_00);
141-
public static final TransportVersion LOGSDB_TELEMETRY_CUSTOM_CUTOFF_DATE = def(8_801_0_00);
142-
public static final TransportVersion SOURCE_MODE_TELEMETRY = def(8_802_0_00);
143-
public static final TransportVersion NEW_REFRESH_CLUSTER_BLOCK = def(8_803_0_00);
144-
public static final TransportVersion RETRIES_AND_OPERATIONS_IN_BLOBSTORE_STATS = def(8_804_0_00);
145-
public static final TransportVersion ADD_DATA_STREAM_OPTIONS_TO_TEMPLATES = def(8_805_0_00);
146-
public static final TransportVersion KNN_QUERY_RESCORE_OVERSAMPLE = def(8_806_0_00);
147-
public static final TransportVersion SEMANTIC_QUERY_LENIENT = def(8_807_0_00);
148-
public static final TransportVersion ESQL_QUERY_BUILDER_IN_SEARCH_FUNCTIONS = def(8_808_0_00);
149-
public static final TransportVersion EQL_ALLOW_PARTIAL_SEARCH_RESULTS = def(8_809_0_00);
150-
public static final TransportVersion NODE_VERSION_INFORMATION_WITH_MIN_READ_ONLY_INDEX_VERSION = def(8_810_0_00);
151-
public static final TransportVersion ERROR_TRACE_IN_TRANSPORT_HEADER = def(8_811_0_00);
152-
public static final TransportVersion FAILURE_STORE_ENABLED_BY_CLUSTER_SETTING = def(8_812_0_00);
153-
public static final TransportVersion SIMULATE_IGNORED_FIELDS = def(8_813_0_00);
154-
public static final TransportVersion TRANSFORMS_UPGRADE_MODE = def(8_814_0_00);
155-
public static final TransportVersion NODE_SHUTDOWN_EPHEMERAL_ID_ADDED = def(8_815_0_00);
156-
public static final TransportVersion ESQL_CCS_TELEMETRY_STATS = def(8_816_0_00);
157-
public static final TransportVersion TEXT_EMBEDDING_QUERY_VECTOR_BUILDER_INFER_MODEL_ID = def(8_817_0_00);
158-
public static final TransportVersion ESQL_ENABLE_NODE_LEVEL_REDUCTION = def(8_818_0_00);
159-
public static final TransportVersion JINA_AI_INTEGRATION_ADDED = def(8_819_0_00);
160-
public static final TransportVersion TRACK_INDEX_FAILED_DUE_TO_VERSION_CONFLICT_METRIC = def(8_820_0_00);
161-
public static final TransportVersion REPLACE_FAILURE_STORE_OPTIONS_WITH_SELECTOR_SYNTAX = def(8_821_0_00);
162-
public static final TransportVersion ELASTIC_INFERENCE_SERVICE_UNIFIED_CHAT_COMPLETIONS_INTEGRATION = def(8_822_0_00);
163-
public static final TransportVersion KQL_QUERY_TECH_PREVIEW = def(8_823_0_00);
164-
public static final TransportVersion ESQL_PROFILE_ROWS_PROCESSED = def(8_824_0_00);
165-
public static final TransportVersion BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1 = def(8_825_0_00);
166-
public static final TransportVersion REVERT_BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1 = def(8_826_0_00);
167-
public static final TransportVersion ESQL_SKIP_ES_INDEX_SERIALIZATION = def(8_827_0_00);
168-
public static final TransportVersion ADD_INDEX_BLOCK_TWO_PHASE = def(8_828_0_00);
169-
public static final TransportVersion RESOLVE_CLUSTER_NO_INDEX_EXPRESSION = def(8_829_0_00);
170-
public static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = def(8_830_0_00);
171-
public static final TransportVersion ADD_INCLUDE_FAILURE_INDICES_OPTION = def(8_831_0_00);
172-
public static final TransportVersion ESQL_RESPONSE_PARTIAL = def(8_832_0_00);
173-
public static final TransportVersion RANK_DOC_OPTIONAL_METADATA_FOR_EXPLAIN = def(8_833_0_00);
174-
public static final TransportVersion ILM_ADD_SEARCHABLE_SNAPSHOT_ADD_REPLICATE_FOR = def(8_834_0_00);
175-
public static final TransportVersion INGEST_REQUEST_INCLUDE_SOURCE_ON_ERROR = def(8_835_0_00);
176-
public static final TransportVersion RESOURCE_DEPRECATION_CHECKS = def(8_836_0_00);
177-
public static final TransportVersion LINEAR_RETRIEVER_SUPPORT = def(8_837_0_00);
178-
public static final TransportVersion TIMEOUT_GET_PARAM_FOR_RESOLVE_CLUSTER = def(8_838_0_00);
179-
public static final TransportVersion INFERENCE_REQUEST_ADAPTIVE_RATE_LIMITING = def(8_839_0_00);
180-
public static final TransportVersion ML_INFERENCE_IBM_WATSONX_RERANK_ADDED = def(8_840_0_00);
138+
public static final TransportVersion V_8_18_0 = def(8_840_0_00);
181139

182140
/*
183141
* STOP! READ THIS FIRST! No, really,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public ClusterStatsNodeResponse(StreamInput in) throws IOException {
5252
repositoryUsageStats = RepositoryUsageStats.EMPTY;
5353
searchCcsMetrics = new CCSTelemetrySnapshot();
5454
}
55-
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_CCS_TELEMETRY_STATS)) {
55+
if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
5656
esqlCcsMetrics = new CCSTelemetrySnapshot(in);
5757
} else {
5858
esqlCcsMetrics = new CCSTelemetrySnapshot();
@@ -131,7 +131,7 @@ public void writeTo(StreamOutput out) throws IOException {
131131
repositoryUsageStats.writeTo(out);
132132
searchCcsMetrics.writeTo(out);
133133
} // else just drop these stats, ok for bwc
134-
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_CCS_TELEMETRY_STATS)) {
134+
if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
135135
esqlCcsMetrics.writeTo(out);
136136
}
137137
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,7 @@ public void writeTo(StreamOutput out) throws IOException {
284284
}
285285

286286
private static boolean canReadOrWriteSourceModeTelemetry(TransportVersion version) {
287-
return version.isPatchFrom(TransportVersions.SOURCE_MODE_TELEMETRY_FIX_8_17)
288-
|| version.onOrAfter(TransportVersions.SOURCE_MODE_TELEMETRY);
287+
return version.isPatchFrom(TransportVersions.SOURCE_MODE_TELEMETRY_FIX_8_17) || version.supports(TransportVersions.V_8_18_0);
289288
}
290289

291290
private static OptionalLong ofNullable(Long l) {

‎server/src/main/java/org/elasticsearch/action/admin/indices/readonly/AddIndexBlockRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public AddIndexBlockRequest(StreamInput in) throws IOException {
4040
indices = in.readStringArray();
4141
indicesOptions = IndicesOptions.readIndicesOptions(in);
4242
block = APIBlock.readFrom(in);
43-
if (in.getTransportVersion().onOrAfter(TransportVersions.ADD_INDEX_BLOCK_TWO_PHASE)) {
43+
if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
4444
markVerified = in.readBoolean();
4545
} else {
4646
markVerified = false;
@@ -132,7 +132,7 @@ public void writeTo(StreamOutput out) throws IOException {
132132
out.writeStringArray(indices);
133133
indicesOptions.writeIndicesOptions(out);
134134
block.writeTo(out);
135-
if (out.getTransportVersion().onOrAfter(TransportVersions.ADD_INDEX_BLOCK_TWO_PHASE)) {
135+
if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
136136
out.writeBoolean(markVerified);
137137
}
138138
}

‎server/src/main/java/org/elasticsearch/action/admin/indices/readonly/TransportVerifyShardIndexBlockAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public static final class ShardRequest extends ReplicationRequest<ShardRequest>
177177
ShardRequest(StreamInput in) throws IOException {
178178
super(in);
179179
clusterBlock = new ClusterBlock(in);
180-
if (in.getTransportVersion().onOrAfter(TransportVersions.ADD_INDEX_BLOCK_TWO_PHASE)) {
180+
if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
181181
phase1 = in.readBoolean();
182182
} else {
183183
phase1 = true; // does not matter, not verified anyway
@@ -200,7 +200,7 @@ public String toString() {
200200
public void writeTo(final StreamOutput out) throws IOException {
201201
super.writeTo(out);
202202
clusterBlock.writeTo(out);
203-
if (out.getTransportVersion().onOrAfter(TransportVersions.ADD_INDEX_BLOCK_TWO_PHASE)) {
203+
if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
204204
out.writeBoolean(phase1);
205205
}
206206
}

‎server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionRequest.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,14 @@ public ResolveClusterActionRequest(StreamInput in) throws IOException {
8484
this.names = in.readStringArray();
8585
this.indicesOptions = IndicesOptions.readIndicesOptions(in);
8686
this.localIndicesRequested = localIndicesPresent(names);
87-
if (in.getTransportVersion().onOrAfter(TransportVersions.RESOLVE_CLUSTER_NO_INDEX_EXPRESSION)) {
87+
if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
8888
this.clusterInfoOnly = in.readBoolean();
8989
this.isQueryingCluster = in.readBoolean();
90+
this.timeout = in.readOptionalTimeValue();
9091
} else {
9192
this.clusterInfoOnly = false;
9293
this.isQueryingCluster = false;
9394
}
94-
if (in.getTransportVersion().onOrAfter(TransportVersions.TIMEOUT_GET_PARAM_FOR_RESOLVE_CLUSTER)) {
95-
this.timeout = in.readOptionalTimeValue();
96-
}
9795
}
9896

9997
@Override
@@ -104,11 +102,9 @@ public void writeTo(StreamOutput out) throws IOException {
104102
}
105103
out.writeStringArray(names);
106104
indicesOptions.writeIndicesOptions(out);
107-
if (out.getTransportVersion().onOrAfter(TransportVersions.RESOLVE_CLUSTER_NO_INDEX_EXPRESSION)) {
105+
if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
108106
out.writeBoolean(clusterInfoOnly);
109107
out.writeBoolean(isQueryingCluster);
110-
}
111-
if (out.getTransportVersion().onOrAfter(TransportVersions.TIMEOUT_GET_PARAM_FOR_RESOLVE_CLUSTER)) {
112108
out.writeOptionalTimeValue(timeout);
113109
}
114110
}

‎server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public BulkRequest(StreamInput in) throws IOException {
105105
} else {
106106
incrementalState = BulkRequest.IncrementalState.EMPTY;
107107
}
108-
if (in.getTransportVersion().onOrAfter(TransportVersions.INGEST_REQUEST_INCLUDE_SOURCE_ON_ERROR)) {
108+
if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
109109
includeSourceOnError = in.readBoolean();
110110
} // else default value is true
111111
}
@@ -471,7 +471,7 @@ public void writeTo(StreamOutput out) throws IOException {
471471
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
472472
incrementalState.writeTo(out);
473473
}
474-
if (out.getTransportVersion().onOrAfter(TransportVersions.INGEST_REQUEST_INCLUDE_SOURCE_ON_ERROR)) {
474+
if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
475475
out.writeBoolean(includeSourceOnError);
476476
}
477477
}

‎server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,9 @@ public DataStreamInfo(
286286
@SuppressWarnings("unchecked")
287287
DataStreamInfo(StreamInput in) throws IOException {
288288
this.dataStream = DataStream.read(in);
289-
this.failureStoreEffectivelyEnabled = in.getTransportVersion()
290-
.onOrAfter(TransportVersions.FAILURE_STORE_ENABLED_BY_CLUSTER_SETTING)
291-
? in.readBoolean()
292-
: dataStream.isFailureStoreExplicitlyEnabled(); // Revert to the behaviour before this field was added
289+
this.failureStoreEffectivelyEnabled = in.getTransportVersion().supports(TransportVersions.V_8_18_0)
290+
? in.readBoolean()
291+
: dataStream.isFailureStoreExplicitlyEnabled(); // Revert to the behaviour before this field was added
293292
this.dataStreamStatus = ClusterHealthStatus.readFrom(in);
294293
this.indexTemplate = in.readOptionalString();
295294
this.ilmPolicyName = in.readOptionalString();
@@ -352,7 +351,7 @@ public String getIndexModeName() {
352351
@Override
353352
public void writeTo(StreamOutput out) throws IOException {
354353
dataStream.writeTo(out);
355-
if (out.getTransportVersion().onOrAfter(TransportVersions.FAILURE_STORE_ENABLED_BY_CLUSTER_SETTING)) {
354+
if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
356355
out.writeBoolean(failureStoreEffectivelyEnabled);
357356
}
358357
dataStreamStatus.writeTo(out);

‎server/src/main/java/org/elasticsearch/action/index/IndexRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public IndexRequest(@Nullable ShardId shardId, StreamInput in) throws IOExceptio
213213
}
214214
}
215215

216-
if (in.getTransportVersion().onOrAfter(TransportVersions.INGEST_REQUEST_INCLUDE_SOURCE_ON_ERROR)) {
216+
if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
217217
includeSourceOnError = in.readBoolean();
218218
} // else default value is true
219219
}
@@ -812,7 +812,7 @@ private void writeBody(StreamOutput out) throws IOException {
812812
out.writeBoolean(false); // obsolete originatesFromUpdateByDoc
813813
}
814814
}
815-
if (out.getTransportVersion().onOrAfter(TransportVersions.INGEST_REQUEST_INCLUDE_SOURCE_ON_ERROR)) {
815+
if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
816816
out.writeBoolean(includeSourceOnError);
817817
}
818818
}

0 commit comments

Comments
 (0)