From 937c478a6b67eea7ab19da6ce3434a985c464ee6 Mon Sep 17 00:00:00 2001 From: Simon Cooper Date: Thu, 26 Jan 2023 14:31:42 +0000 Subject: [PATCH 1/5] Migrate a variety of classes to TransportVersion --- .../AutoDateHistogramAggregationBuilder.java | 5 ++-- .../histogram/InternalAutoDateHistogram.java | 6 ++--- .../metric/MatrixStatsAggregationBuilder.java | 5 ++-- .../ingest/common/GrokProcessorGetAction.java | 5 ++-- .../stats/GeoIpDownloaderStatsAction.java | 5 ++-- .../mustache/MultiSearchTemplateResponse.java | 5 ++-- .../percolator/PercolateQueryBuilder.java | 8 +++--- .../upgrades/DesiredNodesUpgradeIT.java | 4 +-- .../main/java/org/elasticsearch/Build.java | 4 +-- .../TransportUpdateDesiredNodesAction.java | 2 +- .../UpdateDesiredNodesRequest.java | 2 +- .../coordination/JoinValidationService.java | 2 +- .../PublicationTransportHandler.java | 9 ++++--- .../cluster/metadata/DesiredNode.java | 9 ++++--- .../cluster/metadata/Metadata.java | 2 +- .../cluster/node/DiscoveryNode.java | 7 ++--- .../cluster/routing/ShardRouting.java | 2 +- .../common/compress/CompressedXContent.java | 6 ++--- .../common/document/DocumentField.java | 9 ++++--- .../common/io/stream/DelayableWriteable.java | 26 +++++++++---------- .../io/stream/RecyclerBytesStreamOutput.java | 2 +- .../common/io/stream/StreamInput.java | 4 +-- .../common/io/stream/StreamOutput.java | 4 +-- .../elasticsearch/common/unit/Processors.java | 16 ++++++------ .../common/xcontent/XContentHelper.java | 3 ++- .../discovery/DiscoveryStats.java | 9 ++++--- .../gateway/LocalAllocateDangledIndices.java | 5 ++-- ...ransportNodesListGatewayStartedShards.java | 9 ++++--- .../health/metadata/HealthMetadata.java | 9 +++---- .../index/translog/Translog.java | 5 ++-- .../recovery/RecoverySnapshotFileRequest.java | 4 +-- .../elasticsearch/monitor/jvm/JvmInfo.java | 6 ++--- .../org/elasticsearch/monitor/os/OsInfo.java | 7 ++--- .../org/elasticsearch/monitor/os/OsStats.java | 5 ++-- .../plugins/PluginDescriptor.java | 23 ++++++++-------- .../plugins/PluginRuntimeInfo.java | 7 ++--- .../script/ScriptContextStats.java | 7 ++--- .../elasticsearch/script/ScriptException.java | 5 ++-- .../org/elasticsearch/script/ScriptStats.java | 5 ++-- .../org/elasticsearch/script/TimeSeries.java | 5 ++-- .../tasks/TaskCancellationService.java | 5 ++-- .../transport/ActionTransportException.java | 5 ++-- .../transport/BytesTransportRequest.java | 9 ++++--- .../transport/ConnectTransportException.java | 5 ++-- .../transport/ProxyConnectionStrategy.java | 5 ++-- .../transport/RemoteConnectionInfo.java | 5 ++-- .../transport/TransportStats.java | 5 ++-- .../cluster/metadata/DesiredNodeTests.java | 13 +++++----- .../io/stream/DelayableWriteableTests.java | 20 +++++++------- .../reindex/BulkByScrollResponseTests.java | 3 ++- .../reindex/BulkByScrollTaskStatusTests.java | 5 ++-- .../license/GetFeatureUsageResponse.java | 9 ++++--- .../protocol/xpack/XPackInfoRequest.java | 10 +++---- .../protocol/xpack/XPackInfoResponse.java | 9 ++++--- .../xpack/graph/GraphExploreRequest.java | 5 ++-- .../ilm/IndexLifecycleExplainResponse.java | 2 +- .../ilm/IndexLifecycleFeatureSetUsage.java | 4 +-- .../xpack/core/ilm/RolloverAction.java | 4 +-- .../xpack/core/indexing/IndexerJobStats.java | 2 +- .../pivot/DateHistogramGroupSource.java | 5 ++-- .../action/MonitoringBulkRequestTests.java | 2 +- .../blobstore/testkit/BlobAnalyzeAction.java | 7 ++--- .../testkit/RepositoryAnalyzeAction.java | 7 ++--- 63 files changed, 222 insertions(+), 187 deletions(-) diff --git a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/AutoDateHistogramAggregationBuilder.java b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/AutoDateHistogramAggregationBuilder.java index 3c1742c2af77a..cac35ce644bf7 100644 --- a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/AutoDateHistogramAggregationBuilder.java +++ b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/AutoDateHistogramAggregationBuilder.java @@ -9,7 +9,6 @@ package org.elasticsearch.aggregations.bucket.histogram; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.Rounding; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -123,7 +122,7 @@ public AutoDateHistogramAggregationBuilder(String name) { public AutoDateHistogramAggregationBuilder(StreamInput in) throws IOException { super(in); numBuckets = in.readVInt(); - if (in.getVersion().onOrAfter(Version.V_7_3_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_3_0)) { minimumIntervalExpression = in.readOptionalString(); } } @@ -131,7 +130,7 @@ public AutoDateHistogramAggregationBuilder(StreamInput in) throws IOException { @Override protected void innerWriteTo(StreamOutput out) throws IOException { out.writeVInt(numBuckets); - if (out.getVersion().onOrAfter(Version.V_7_3_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_3_0)) { out.writeOptionalString(minimumIntervalExpression); } } diff --git a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/InternalAutoDateHistogram.java b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/InternalAutoDateHistogram.java index 4860bedaee61a..c91a6bed8a716 100644 --- a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/InternalAutoDateHistogram.java +++ b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/InternalAutoDateHistogram.java @@ -8,7 +8,7 @@ package org.elasticsearch.aggregations.bucket.histogram; import org.apache.lucene.util.PriorityQueue; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.aggregations.bucket.histogram.AutoDateHistogramAggregationBuilder.RoundingInfo; import org.elasticsearch.common.Rounding; import org.elasticsearch.common.io.stream.StreamInput; @@ -226,7 +226,7 @@ public InternalAutoDateHistogram(StreamInput in) throws IOException { format = in.readNamedWriteable(DocValueFormat.class); buckets = in.readList(stream -> new Bucket(stream, format)); this.targetBuckets = in.readVInt(); - if (in.getVersion().onOrAfter(Version.V_8_3_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_3_0)) { bucketInnerInterval = in.readVLong(); } else { bucketInnerInterval = 1; // Calculated on merge. @@ -239,7 +239,7 @@ protected void doWriteTo(StreamOutput out) throws IOException { out.writeNamedWriteable(format); out.writeList(buckets); out.writeVInt(targetBuckets); - if (out.getVersion().onOrAfter(Version.V_8_3_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_3_0)) { out.writeVLong(bucketInnerInterval); } } diff --git a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/MatrixStatsAggregationBuilder.java b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/MatrixStatsAggregationBuilder.java index ee45a32dd8501..d8edb19c2782b 100644 --- a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/MatrixStatsAggregationBuilder.java +++ b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/MatrixStatsAggregationBuilder.java @@ -8,7 +8,6 @@ package org.elasticsearch.aggregations.metric; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.search.MultiValueMode; @@ -56,14 +55,14 @@ public boolean supportsSampling() { */ public MatrixStatsAggregationBuilder(StreamInput in) throws IOException { super(in); - if (in.getVersion().onOrAfter(Version.V_8_7_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_7_0)) { multiValueMode = MultiValueMode.readMultiValueModeFrom(in); } } @Override protected void innerWriteTo(StreamOutput out) throws IOException { - if (out.getVersion().onOrAfter(Version.V_8_7_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_7_0)) { multiValueMode.writeTo(out); } } diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java index 5dcf944eaa2ad..10d9179786b73 100644 --- a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java +++ b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java @@ -7,6 +7,7 @@ */ package org.elasticsearch.ingest.common; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRequest; @@ -57,7 +58,7 @@ public Request(boolean sorted, String ecsCompatibility) { Request(StreamInput in) throws IOException { super(in); this.sorted = in.readBoolean(); - this.ecsCompatibility = in.getVersion().onOrAfter(Version.V_8_0_0) + this.ecsCompatibility = in.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0) ? in.readString() : GrokProcessor.DEFAULT_ECS_COMPATIBILITY_MODE; } @@ -71,7 +72,7 @@ public ActionRequestValidationException validate() { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeBoolean(sorted); - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0)) { out.writeString(ecsCompatibility); } } diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsAction.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsAction.java index a160dfeec9b4a..c65946de25efc 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsAction.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsAction.java @@ -8,6 +8,7 @@ package org.elasticsearch.ingest.geoip.stats; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.FailedNodeException; @@ -166,7 +167,7 @@ protected NodeResponse(StreamInput in) throws IOException { stats = in.readBoolean() ? new GeoIpDownloaderStats(in) : null; databases = in.readSet(StreamInput::readString); filesInTemp = in.readSet(StreamInput::readString); - configDatabases = in.getVersion().onOrAfter(Version.V_8_0_0) ? in.readSet(StreamInput::readString) : null; + configDatabases = in.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0) ? in.readSet(StreamInput::readString) : null; } protected NodeResponse( @@ -208,7 +209,7 @@ public void writeTo(StreamOutput out) throws IOException { } out.writeCollection(databases, StreamOutput::writeString); out.writeCollection(filesInTemp, StreamOutput::writeString); - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0)) { out.writeCollection(configDatabases, StreamOutput::writeString); } } diff --git a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateResponse.java b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateResponse.java index 5aa962973b6f8..5c890c205ffd8 100644 --- a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateResponse.java +++ b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateResponse.java @@ -10,6 +10,7 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ExceptionsHelper; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.search.MultiSearchResponse; @@ -102,7 +103,7 @@ public String toString() { MultiSearchTemplateResponse(StreamInput in) throws IOException { super(in); items = in.readArray(Item::new, Item[]::new); - if (in.getVersion().onOrAfter(Version.V_7_0_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_0_0)) { tookInMillis = in.readVLong(); } else { tookInMillis = -1L; @@ -136,7 +137,7 @@ public TimeValue getTook() { @Override public void writeTo(StreamOutput out) throws IOException { out.writeArray(items); - if (out.getVersion().onOrAfter(Version.V_7_0_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_0_0)) { out.writeVLong(tookInMillis); } } diff --git a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolateQueryBuilder.java b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolateQueryBuilder.java index ec924eef6184d..f2d06e2b72d47 100644 --- a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolateQueryBuilder.java +++ b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolateQueryBuilder.java @@ -217,12 +217,12 @@ protected PercolateQueryBuilder(String field, Supplier documentS super(in); field = in.readString(); name = in.readOptionalString(); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { String documentType = in.readOptionalString(); assert documentType == null; } indexedDocumentIndex = in.readOptionalString(); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { String indexedDocumentType = in.readOptionalString(); assert indexedDocumentType == null; } @@ -259,12 +259,12 @@ protected void doWriteTo(StreamOutput out) throws IOException { } out.writeString(field); out.writeOptionalString(name); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { // In 7x, typeless percolate queries are represented by null documentType values out.writeOptionalString(null); } out.writeOptionalString(indexedDocumentIndex); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { // In 7x, typeless percolate queries are represented by null indexedDocumentType values out.writeOptionalString(null); } diff --git a/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/DesiredNodesUpgradeIT.java b/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/DesiredNodesUpgradeIT.java index e0c42429f71c5..2cbfe030be09c 100644 --- a/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/DesiredNodesUpgradeIT.java +++ b/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/DesiredNodesUpgradeIT.java @@ -43,9 +43,9 @@ public void testUpgradeDesiredNodes() throws Exception { return; } - if (UPGRADE_FROM_VERSION.onOrAfter(Processors.DOUBLE_PROCESSORS_SUPPORT_VERSION)) { + if (UPGRADE_FROM_VERSION.transportVersion.onOrAfter(Processors.DOUBLE_PROCESSORS_SUPPORT_VERSION)) { assertUpgradedNodesCanReadDesiredNodes(); - } else if (UPGRADE_FROM_VERSION.onOrAfter(DesiredNode.RANGE_FLOAT_PROCESSORS_SUPPORT_VERSION)) { + } else if (UPGRADE_FROM_VERSION.transportVersion.onOrAfter(DesiredNode.RANGE_FLOAT_PROCESSORS_SUPPORT_VERSION)) { assertDesiredNodesUpdatedWithRoundedUpFloatsAreIdempotent(); } else { assertDesiredNodesWithFloatProcessorsAreRejectedInOlderVersions(); diff --git a/server/src/main/java/org/elasticsearch/Build.java b/server/src/main/java/org/elasticsearch/Build.java index 9cddfd504a0e5..7279e0c4aa4c1 100644 --- a/server/src/main/java/org/elasticsearch/Build.java +++ b/server/src/main/java/org/elasticsearch/Build.java @@ -151,7 +151,7 @@ static URL getElasticsearchCodeSourceLocation() { public static Build readBuild(StreamInput in) throws IOException { final Type type; // be lenient when reading on the wire, the enumeration values from other versions might be different than what we know - if (in.getVersion().before(Version.V_8_3_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_3_0)) { // this was the flavor, which is always the default distribution now in.readString(); } @@ -167,7 +167,7 @@ public static Build readBuild(StreamInput in) throws IOException { } public static void writeBuild(Build build, StreamOutput out) throws IOException { - if (out.getVersion().before(Version.V_8_3_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_3_0)) { // this was the flavor, which is always the default distribution now out.writeString("default"); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportUpdateDesiredNodesAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportUpdateDesiredNodesAction.java index b0d7000afa8ac..8c032370c2772 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportUpdateDesiredNodesAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportUpdateDesiredNodesAction.java @@ -97,7 +97,7 @@ protected void masterOperation( @Override protected void doExecute(Task task, UpdateDesiredNodesRequest request, ActionListener listener) { final var minNodeVersion = clusterService.state().nodes().getMinNodeVersion(); - if (request.isCompatibleWithVersion(minNodeVersion) == false) { + if (request.isCompatibleWithVersion(minNodeVersion.transportVersion) == false) { listener.onFailure( new IllegalArgumentException( "Unable to use processor ranges, floating-point (with greater precision) processors " diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java index fa95c4a7df69e..092b015aa1f2d 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java @@ -99,7 +99,7 @@ public boolean isDryRun() { return dryRun; } - public boolean isCompatibleWithVersion(Version version) { + public boolean isCompatibleWithVersion(TransportVersion version) { if (version.onOrAfter(DesiredNode.RANGE_FLOAT_PROCESSORS_SUPPORT_VERSION)) { return true; } diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/JoinValidationService.java b/server/src/main/java/org/elasticsearch/cluster/coordination/JoinValidationService.java index f2dde93f16e84..ecadc771ebdaf 100644 --- a/server/src/main/java/org/elasticsearch/cluster/coordination/JoinValidationService.java +++ b/server/src/main/java/org/elasticsearch/cluster/coordination/JoinValidationService.java @@ -308,7 +308,7 @@ protected void doRun() throws Exception { transportService.sendRequest( discoveryNode, JOIN_VALIDATE_ACTION_NAME, - new BytesTransportRequest(bytes, discoveryNode.getVersion()), + new BytesTransportRequest(bytes, discoveryNode.getVersion().transportVersion), REQUEST_OPTIONS, new CleanableResponseHandler<>( listener, diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java b/server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java index 526eac3f2687d..77bd76b27d95f 100644 --- a/server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java +++ b/server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java @@ -10,6 +10,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.ElasticsearchException; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRunnable; @@ -85,7 +86,7 @@ public class PublicationTransportHandler { TransportRequestOptions.Type.STATE ); - public static final Version INCLUDES_LAST_COMMITTED_DATA_VERSION = Version.V_8_6_0; + public static final TransportVersion INCLUDES_LAST_COMMITTED_DATA_VERSION = TransportVersion.V_8_6_0; private final SerializationStatsTracker serializationStatsTracker = new SerializationStatsTracker(); @@ -125,7 +126,7 @@ private PublishWithJoinResponse handleIncomingPublishRequest(BytesTransportReque in = new InputStreamStreamInput(compressor.threadLocalInputStream(in)); } in = new NamedWriteableAwareStreamInput(in, namedWriteableRegistry); - in.setVersion(request.version()); + in.setTransportVersion(request.version()); // If true we received full cluster state - otherwise diffs if (in.readBoolean()) { final ClusterState incomingState; @@ -236,7 +237,7 @@ private ReleasableBytesReference serializeFullClusterState(ClusterState clusterS CompressorFactory.COMPRESSOR.threadLocalOutputStream(Streams.flushOnCloseStream(bytesStream)) ) ) { - stream.setVersion(nodeVersion); + stream.setTransportVersion(nodeVersion); stream.writeBoolean(true); clusterState.writeTo(stream); uncompressedBytes = stream.position(); @@ -466,7 +467,7 @@ private void sendClusterState( transportService.sendChildRequest( destination, PUBLISH_STATE_ACTION_NAME, - new BytesTransportRequest(bytes, destination.getVersion()), + new BytesTransportRequest(bytes, destination.getVersion().transportVersion), task, STATE_REQUEST_OPTIONS, new CleanableResponseHandler<>(listener, PublishWithJoinResponse::new, ThreadPool.Names.CLUSTER_COORDINATION, bytes::decRef) diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DesiredNode.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DesiredNode.java index 32b060cc9682a..2c29df2e661c7 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/DesiredNode.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/DesiredNode.java @@ -8,6 +8,7 @@ package org.elasticsearch.cluster.metadata; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.node.DiscoveryNodeRole; @@ -38,7 +39,7 @@ import static org.elasticsearch.node.NodeRoleSettings.NODE_ROLES_SETTING; public final class DesiredNode implements Writeable, ToXContentObject, Comparable { - public static final Version RANGE_FLOAT_PROCESSORS_SUPPORT_VERSION = Version.V_8_3_0; + public static final TransportVersion RANGE_FLOAT_PROCESSORS_SUPPORT_VERSION = TransportVersion.V_8_3_0; private static final ParseField SETTINGS_FIELD = new ParseField("settings"); private static final ParseField PROCESSORS_FIELD = new ParseField("processors"); @@ -173,7 +174,7 @@ public static DesiredNode readFrom(StreamInput in) throws IOException { final var settings = Settings.readSettingsFromStream(in); final Processors processors; final ProcessorsRange processorsRange; - if (in.getTransportVersion().onOrAfter(RANGE_FLOAT_PROCESSORS_SUPPORT_VERSION.transportVersion)) { + if (in.getTransportVersion().onOrAfter(RANGE_FLOAT_PROCESSORS_SUPPORT_VERSION)) { processors = in.readOptionalWriteable(Processors::readFrom); processorsRange = in.readOptionalWriteable(ProcessorsRange::readFrom); } else { @@ -189,7 +190,7 @@ public static DesiredNode readFrom(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { settings.writeTo(out); - if (out.getTransportVersion().onOrAfter(RANGE_FLOAT_PROCESSORS_SUPPORT_VERSION.transportVersion)) { + if (out.getTransportVersion().onOrAfter(RANGE_FLOAT_PROCESSORS_SUPPORT_VERSION)) { out.writeOptionalWriteable(processors); out.writeOptionalWriteable(processorsRange); } else { @@ -296,7 +297,7 @@ public Set getRoles() { return roles; } - public boolean isCompatibleWithVersion(Version version) { + public boolean isCompatibleWithVersion(TransportVersion version) { if (version.onOrAfter(RANGE_FLOAT_PROCESSORS_SUPPORT_VERSION)) { return true; } diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java index 06f4b29b681b3..4d19109738a88 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java @@ -1446,7 +1446,7 @@ private static class MetadataDiff implements Diff { private static final TransportVersion NOOP_METADATA_DIFF_VERSION = TransportVersion.V_8_5_0; private static final TransportVersion NOOP_METADATA_DIFF_SAFE_VERSION = - PublicationTransportHandler.INCLUDES_LAST_COMMITTED_DATA_VERSION.transportVersion; + PublicationTransportHandler.INCLUDES_LAST_COMMITTED_DATA_VERSION; private final long version; private final String clusterUUID; diff --git a/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java index 73cf25fd3e8e6..e3998a1580ef3 100644 --- a/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java +++ b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java @@ -8,6 +8,7 @@ package org.elasticsearch.cluster.node; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.UUIDs; @@ -63,7 +64,7 @@ public static boolean isStateless(final Settings settings) { } static final String COORDINATING_ONLY = "coordinating_only"; - public static final Version EXTERNAL_ID_VERSION = Version.V_8_3_0; + public static final TransportVersion EXTERNAL_ID_VERSION = TransportVersion.V_8_3_0; public static final Comparator DISCOVERY_NODE_COMPARATOR = Comparator.comparing(DiscoveryNode::getName) .thenComparing(DiscoveryNode::getId); @@ -412,7 +413,7 @@ public DiscoveryNode(StreamInput in) throws IOException { } this.roles = Collections.unmodifiableSortedSet(roles); this.version = Version.readVersion(in); - if (in.getVersion().onOrAfter(EXTERNAL_ID_VERSION)) { + if (in.getTransportVersion().onOrAfter(EXTERNAL_ID_VERSION)) { this.externalId = readStringLiteral.read(in); } else { this.externalId = nodeName; @@ -445,7 +446,7 @@ public void writeTo(StreamOutput out) throws IOException { o.writeBoolean(role.canContainData()); }); Version.writeVersion(version, out); - if (out.getVersion().onOrAfter(EXTERNAL_ID_VERSION)) { + if (out.getTransportVersion().onOrAfter(EXTERNAL_ID_VERSION)) { out.writeString(externalId); } } diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java b/server/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java index 2e993cc120c18..37ae9784d9cfa 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java @@ -393,7 +393,7 @@ public void writeToThin(StreamOutput out) throws IOException { role.writeTo(out); } else if (role != Role.DEFAULT) { throw new IllegalStateException( - Strings.format("cannot send role [%s] to node of version [%s]", role, out.getTransportVersion()) + Strings.format("cannot send role [%s] with transport version [%s]", role, out.getTransportVersion()) ); } } diff --git a/server/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java b/server/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java index b6b69a9d4d22a..2de39744e40a7 100644 --- a/server/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java +++ b/server/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java @@ -9,7 +9,7 @@ package org.elasticsearch.common.compress; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.hash.MessageDigests; @@ -209,7 +209,7 @@ public String getSha256() { public static CompressedXContent readCompressedString(StreamInput in) throws IOException { final String sha256; final byte[] compressedData; - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0)) { sha256 = in.readString(); compressedData = in.readByteArray(); } else { @@ -221,7 +221,7 @@ public static CompressedXContent readCompressedString(StreamInput in) throws IOE } public void writeTo(StreamOutput out) throws IOException { - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0)) { out.writeString(sha256); } else { int crc32 = crc32FromCompressed(bytes); diff --git a/server/src/main/java/org/elasticsearch/common/document/DocumentField.java b/server/src/main/java/org/elasticsearch/common/document/DocumentField.java index ec6f378c4c07c..07bf6197efe37 100644 --- a/server/src/main/java/org/elasticsearch/common/document/DocumentField.java +++ b/server/src/main/java/org/elasticsearch/common/document/DocumentField.java @@ -8,6 +8,7 @@ package org.elasticsearch.common.document; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -44,12 +45,12 @@ public class DocumentField implements Writeable, Iterable { public DocumentField(StreamInput in) throws IOException { name = in.readString(); values = in.readList(StreamInput::readGenericValue); - if (in.getVersion().onOrAfter(Version.V_7_16_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_16_0)) { ignoredValues = in.readList(StreamInput::readGenericValue); } else { ignoredValues = Collections.emptyList(); } - if (in.getVersion().onOrAfter(Version.V_8_2_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_2_0)) { lookupFields = in.readList(LookupField::new); } else { lookupFields = List.of(); @@ -114,10 +115,10 @@ public List getIgnoredValues() { public void writeTo(StreamOutput out) throws IOException { out.writeString(name); out.writeCollection(values, StreamOutput::writeGenericValue); - if (out.getVersion().onOrAfter(Version.V_7_16_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_16_0)) { out.writeCollection(ignoredValues, StreamOutput::writeGenericValue); } - if (out.getVersion().onOrAfter(Version.V_8_2_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_2_0)) { out.writeList(lookupFields); } else { if (lookupFields.isEmpty() == false) { diff --git a/server/src/main/java/org/elasticsearch/common/io/stream/DelayableWriteable.java b/server/src/main/java/org/elasticsearch/common/io/stream/DelayableWriteable.java index 5c637f27dfd19..8ec408c2b08c3 100644 --- a/server/src/main/java/org/elasticsearch/common/io/stream/DelayableWriteable.java +++ b/server/src/main/java/org/elasticsearch/common/io/stream/DelayableWriteable.java @@ -8,7 +8,7 @@ package org.elasticsearch.common.io.stream; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.ReleasableBytesReference; import org.elasticsearch.core.Releasable; @@ -49,12 +49,12 @@ public static DelayableWriteable referencing(T referenc * when {@link #expand()} is called. */ public static DelayableWriteable delayed(Writeable.Reader reader, StreamInput in) throws IOException { - return new Serialized<>(reader, in.getVersion(), in.namedWriteableRegistry(), in.readReleasableBytesReference()); + return new Serialized<>(reader, in.getTransportVersion(), in.namedWriteableRegistry(), in.readReleasableBytesReference()); } public static DelayableWriteable referencing(Writeable.Reader reader, StreamInput in) throws IOException { try (ReleasableBytesReference serialized = in.readReleasableBytesReference()) { - return new Referencing<>(deserialize(reader, in.getVersion(), in.namedWriteableRegistry(), serialized)); + return new Referencing<>(deserialize(reader, in.getTransportVersion(), in.namedWriteableRegistry(), serialized)); } } @@ -103,12 +103,12 @@ public T expand() { public Serialized asSerialized(Reader reader, NamedWriteableRegistry registry) { BytesStreamOutput buffer; try { - buffer = writeToBuffer(Version.CURRENT); + buffer = writeToBuffer(TransportVersion.CURRENT); } catch (IOException e) { throw new RuntimeException("unexpected error writing writeable to buffer", e); } // TODO: this path is currently not used in production code, if it ever is this should start using pooled buffers - return new Serialized<>(reader, Version.CURRENT, registry, ReleasableBytesReference.wrap(buffer.bytes())); + return new Serialized<>(reader, TransportVersion.CURRENT, registry, ReleasableBytesReference.wrap(buffer.bytes())); } @Override @@ -121,9 +121,9 @@ public long getSerializedSize() { return DelayableWriteable.getSerializedSize(reference); } - private BytesStreamOutput writeToBuffer(Version version) throws IOException { + private BytesStreamOutput writeToBuffer(TransportVersion version) throws IOException { try (BytesStreamOutput buffer = new BytesStreamOutput()) { - buffer.setVersion(version); + buffer.setTransportVersion(version); reference.writeTo(buffer); return buffer; } @@ -141,13 +141,13 @@ public void close() { */ public static class Serialized extends DelayableWriteable { private final Writeable.Reader reader; - private final Version serializedAtVersion; + private final TransportVersion serializedAtVersion; private final NamedWriteableRegistry registry; private final ReleasableBytesReference serialized; private Serialized( Writeable.Reader reader, - Version serializedAtVersion, + TransportVersion serializedAtVersion, NamedWriteableRegistry registry, ReleasableBytesReference serialized ) { @@ -159,7 +159,7 @@ private Serialized( @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getVersion() == serializedAtVersion) { + if (out.getTransportVersion() == serializedAtVersion) { /* * If the version *does* line up we can just copy the bytes * which is good because this is how shard request caching @@ -214,7 +214,7 @@ public void close() { */ public static long getSerializedSize(Writeable ref) { try (CountingStreamOutput out = new CountingStreamOutput()) { - out.setVersion(Version.CURRENT); + out.setTransportVersion(TransportVersion.CURRENT); ref.writeTo(out); return out.size; } catch (IOException exc) { @@ -224,7 +224,7 @@ public static long getSerializedSize(Writeable ref) { private static T deserialize( Reader reader, - Version serializedAtVersion, + TransportVersion serializedAtVersion, NamedWriteableRegistry registry, BytesReference serialized ) throws IOException { @@ -233,7 +233,7 @@ private static T deserialize( ? serialized.streamInput() : new NamedWriteableAwareStreamInput(serialized.streamInput(), registry) ) { - in.setVersion(serializedAtVersion); + in.setTransportVersion(serializedAtVersion); return reader.read(in); } } diff --git a/server/src/main/java/org/elasticsearch/common/io/stream/RecyclerBytesStreamOutput.java b/server/src/main/java/org/elasticsearch/common/io/stream/RecyclerBytesStreamOutput.java index 7c372f6b52bff..4ebebdbd8e9bb 100644 --- a/server/src/main/java/org/elasticsearch/common/io/stream/RecyclerBytesStreamOutput.java +++ b/server/src/main/java/org/elasticsearch/common/io/stream/RecyclerBytesStreamOutput.java @@ -127,7 +127,7 @@ public void writeWithSizePrefix(Writeable writeable) throws IOException { // manipulation of the offsets on the pages after writing to tmp. This will require adjustments to the places in this class // that make assumptions about the page size try (RecyclerBytesStreamOutput tmp = new RecyclerBytesStreamOutput(recycler)) { - tmp.setVersion(getVersion()); + tmp.setTransportVersion(getTransportVersion()); writeable.writeTo(tmp); int size = tmp.size(); writeVInt(size); diff --git a/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java index c50f56e5a0b74..edcde17c81451 100644 --- a/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java +++ b/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java @@ -755,10 +755,10 @@ public Object readGenericValue() throws IOException { case 6 -> readByteArray(); case 7 -> readArrayList(); case 8 -> readArray(); - case 9 -> getVersion().onOrAfter(Version.V_8_7_0) + case 9 -> getTransportVersion().onOrAfter(TransportVersion.V_8_7_0) ? readOrderedMap(StreamInput::readGenericValue, StreamInput::readGenericValue) : readOrderedMap(StreamInput::readString, StreamInput::readGenericValue); - case 10 -> getVersion().onOrAfter(Version.V_8_7_0) + case 10 -> getTransportVersion().onOrAfter(TransportVersion.V_8_7_0) ? readMap(StreamInput::readGenericValue, StreamInput::readGenericValue) : readMap(StreamInput::readString, StreamInput::readGenericValue); case 11 -> readByte(); diff --git a/server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java b/server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java index 7a5d1b59133f1..feec66ce790ae 100644 --- a/server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java +++ b/server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java @@ -578,7 +578,7 @@ public void writeMapWithConsistentOrder(@Nullable Map .iterator(); while (iterator.hasNext()) { Map.Entry next = iterator.next(); - if (this.getVersion().onOrAfter(Version.V_8_7_0)) { + if (this.getTransportVersion().onOrAfter(TransportVersion.V_8_7_0)) { this.writeGenericValue(next.getKey()); } else { this.writeString(next.getKey()); @@ -709,7 +709,7 @@ public final void writeOptionalInstant(@Nullable Instant instant) throws IOExcep } else { o.writeByte((byte) 10); } - if (o.getVersion().onOrAfter(Version.V_8_7_0)) { + if (o.getTransportVersion().onOrAfter(TransportVersion.V_8_7_0)) { final Map map = (Map) v; o.writeMap(map, StreamOutput::writeGenericValue, StreamOutput::writeGenericValue); } else { diff --git a/server/src/main/java/org/elasticsearch/common/unit/Processors.java b/server/src/main/java/org/elasticsearch/common/unit/Processors.java index b95bdd3615f3c..89db778266eae 100644 --- a/server/src/main/java/org/elasticsearch/common/unit/Processors.java +++ b/server/src/main/java/org/elasticsearch/common/unit/Processors.java @@ -8,7 +8,7 @@ package org.elasticsearch.common.unit; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -29,8 +29,8 @@ public class Processors implements Writeable, Comparable, ToXContent public static final Processors ZERO = new Processors(0.0); public static final Processors MAX_PROCESSORS = new Processors(Double.MAX_VALUE); - public static final Version FLOAT_PROCESSORS_SUPPORT_VERSION = Version.V_8_3_0; - public static final Version DOUBLE_PROCESSORS_SUPPORT_VERSION = Version.V_8_5_0; + public static final TransportVersion FLOAT_PROCESSORS_SUPPORT_VERSION = TransportVersion.V_8_3_0; + public static final TransportVersion DOUBLE_PROCESSORS_SUPPORT_VERSION = TransportVersion.V_8_5_0; static final int NUMBER_OF_DECIMAL_PLACES = 5; private static final double MIN_REPRESENTABLE_PROCESSORS = 1E-5; @@ -63,9 +63,9 @@ public static Processors of(Double count) { public static Processors readFrom(StreamInput in) throws IOException { final double processorCount; - if (in.getVersion().before(FLOAT_PROCESSORS_SUPPORT_VERSION)) { + if (in.getTransportVersion().before(FLOAT_PROCESSORS_SUPPORT_VERSION)) { processorCount = in.readInt(); - } else if (in.getVersion().before(DOUBLE_PROCESSORS_SUPPORT_VERSION)) { + } else if (in.getTransportVersion().before(DOUBLE_PROCESSORS_SUPPORT_VERSION)) { processorCount = in.readFloat(); } else { processorCount = in.readDouble(); @@ -75,10 +75,10 @@ public static Processors readFrom(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getVersion().before(FLOAT_PROCESSORS_SUPPORT_VERSION)) { + if (out.getTransportVersion().before(FLOAT_PROCESSORS_SUPPORT_VERSION)) { assert hasDecimals() == false; out.writeInt((int) count); - } else if (out.getVersion().before(DOUBLE_PROCESSORS_SUPPORT_VERSION)) { + } else if (out.getTransportVersion().before(DOUBLE_PROCESSORS_SUPPORT_VERSION)) { out.writeFloat((float) count); } else { out.writeDouble(count); @@ -143,7 +143,7 @@ private boolean hasDecimals() { return ((int) count) != Math.ceil(count); } - public boolean isCompatibleWithVersion(Version version) { + public boolean isCompatibleWithVersion(TransportVersion version) { if (version.onOrAfter(FLOAT_PROCESSORS_SUPPORT_VERSION)) { return true; } diff --git a/server/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java index a71f4fe70f324..6dd913e932784 100644 --- a/server/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java +++ b/server/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java @@ -10,6 +10,7 @@ import org.elasticsearch.ElasticsearchGenerationException; import org.elasticsearch.ElasticsearchParseException; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesArray; @@ -594,7 +595,7 @@ public static BytesReference childBytes(XContentParser parser) throws IOExceptio * @param xContentType an instance to serialize */ public static void writeTo(StreamOutput out, XContentType xContentType) throws IOException { - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { // when sending an enumeration to { public Request(StreamInput in) throws IOException { super(in); shardId = new ShardId(in); - if (in.getVersion().onOrAfter(Version.V_7_6_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_6_0)) { customDataPath = in.readString(); } else { customDataPath = null; @@ -222,7 +223,7 @@ public String getCustomDataPath() { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); shardId.writeTo(out); - if (out.getVersion().onOrAfter(Version.V_7_6_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_6_0)) { out.writeString(customDataPath); } } @@ -262,7 +263,7 @@ public static class NodeRequest extends TransportRequest { public NodeRequest(StreamInput in) throws IOException { super(in); shardId = new ShardId(in); - if (in.getVersion().onOrAfter(Version.V_7_6_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_6_0)) { customDataPath = in.readString(); } else { customDataPath = null; @@ -278,7 +279,7 @@ public NodeRequest(Request request) { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); shardId.writeTo(out); - if (out.getVersion().onOrAfter(Version.V_7_6_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_6_0)) { assert customDataPath != null; out.writeString(customDataPath); } diff --git a/server/src/main/java/org/elasticsearch/health/metadata/HealthMetadata.java b/server/src/main/java/org/elasticsearch/health/metadata/HealthMetadata.java index 4a20913c094c7..859a4fc2a8c15 100644 --- a/server/src/main/java/org/elasticsearch/health/metadata/HealthMetadata.java +++ b/server/src/main/java/org/elasticsearch/health/metadata/HealthMetadata.java @@ -9,7 +9,6 @@ package org.elasticsearch.health.metadata; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.cluster.AbstractNamedDiffable; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.NamedDiff; @@ -117,7 +116,7 @@ public record Disk( ) implements ToXContentFragment, Writeable { public static final String TYPE = "disk"; - public static Version VERSION_SUPPORTING_HEADROOM_FIELDS = Version.V_8_5_0; + public static final TransportVersion VERSION_SUPPORTING_HEADROOM_FIELDS = TransportVersion.V_8_5_0; private static final ParseField HIGH_WATERMARK_FIELD = new ParseField("high_watermark"); private static final ParseField HIGH_MAX_HEADROOM_FIELD = new ParseField("high_max_headroom"); @@ -140,10 +139,10 @@ static Disk readFrom(StreamInput in) throws IOException { FROZEN_FLOOD_STAGE_WATERMARK_FIELD.getPreferredName() ); ByteSizeValue frozenFloodStageMaxHeadroom = ByteSizeValue.readFrom(in); - ByteSizeValue highMaxHeadroom = in.getVersion().onOrAfter(VERSION_SUPPORTING_HEADROOM_FIELDS) + ByteSizeValue highMaxHeadroom = in.getTransportVersion().onOrAfter(VERSION_SUPPORTING_HEADROOM_FIELDS) ? ByteSizeValue.readFrom(in) : ByteSizeValue.MINUS_ONE; - ByteSizeValue floodStageMaxHeadroom = in.getVersion().onOrAfter(VERSION_SUPPORTING_HEADROOM_FIELDS) + ByteSizeValue floodStageMaxHeadroom = in.getTransportVersion().onOrAfter(VERSION_SUPPORTING_HEADROOM_FIELDS) ? ByteSizeValue.readFrom(in) : ByteSizeValue.MINUS_ONE; return new Disk( @@ -162,7 +161,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(describeFloodStageWatermark()); out.writeString(describeFrozenFloodStageWatermark()); frozenFloodStageMaxHeadroom.writeTo(out); - if (out.getVersion().onOrAfter(VERSION_SUPPORTING_HEADROOM_FIELDS)) { + if (out.getTransportVersion().onOrAfter(VERSION_SUPPORTING_HEADROOM_FIELDS)) { highMaxHeadroom.writeTo(out); floodStageMaxHeadroom.writeTo(out); } diff --git a/server/src/main/java/org/elasticsearch/index/translog/Translog.java b/server/src/main/java/org/elasticsearch/index/translog/Translog.java index daf29a95c15a6..1dad9ea9b5bb3 100644 --- a/server/src/main/java/org/elasticsearch/index/translog/Translog.java +++ b/server/src/main/java/org/elasticsearch/index/translog/Translog.java @@ -9,6 +9,7 @@ package org.elasticsearch.index.translog; import org.apache.lucene.store.AlreadyClosedException; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.UUIDs; @@ -1240,7 +1241,7 @@ public long version() { } private void write(final StreamOutput out) throws IOException { - final int format = out.getVersion().onOrAfter(Version.V_8_0_0) ? SERIALIZATION_FORMAT : FORMAT_NO_VERSION_TYPE; + final int format = out.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0) ? SERIALIZATION_FORMAT : FORMAT_NO_VERSION_TYPE; out.writeVInt(format); out.writeString(id); if (format < FORMAT_NO_DOC_TYPE) { @@ -1401,7 +1402,7 @@ public BytesReference source() { } private void write(final StreamOutput out) throws IOException { - final int format = out.getVersion().onOrAfter(Version.V_8_0_0) ? SERIALIZATION_FORMAT : FORMAT_NO_VERSION_TYPE; + final int format = out.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0) ? SERIALIZATION_FORMAT : FORMAT_NO_VERSION_TYPE; out.writeVInt(format); if (format < FORMAT_NO_DOC_TYPE) { out.writeString(MapperService.SINGLE_MAPPING_NAME); diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySnapshotFileRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySnapshotFileRequest.java index 2f2558eab3d82..47cf4ef4824ee 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySnapshotFileRequest.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySnapshotFileRequest.java @@ -50,8 +50,8 @@ public RecoverySnapshotFileRequest(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { - assert out.getVersion().onOrAfter(RecoverySettings.SNAPSHOT_RECOVERIES_SUPPORTED_VERSION) - : "Unexpected serialization version " + out.getVersion(); + assert out.getTransportVersion().onOrAfter(RecoverySettings.SNAPSHOT_RECOVERIES_SUPPORTED_VERSION.transportVersion) + : "Unexpected serialization version " + out.getTransportVersion(); super.writeTo(out); out.writeLong(recoveryId); shardId.writeTo(out); diff --git a/server/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java b/server/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java index c4b450946adc0..f928f83531aa0 100644 --- a/server/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java +++ b/server/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java @@ -9,7 +9,7 @@ package org.elasticsearch.monitor.jvm; import org.apache.lucene.util.Constants; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -268,7 +268,7 @@ public JvmInfo(StreamInput in) throws IOException { vmName = in.readString(); vmVersion = in.readString(); vmVendor = in.readString(); - if (in.getVersion().before(Version.V_8_3_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_3_0)) { // Before 8.0 the no-jdk distributions could have bundledJdk false, this is always true now. in.readBoolean(); } @@ -302,7 +302,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(vmName); out.writeString(vmVersion); out.writeString(vmVendor); - if (out.getVersion().before(Version.V_8_3_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_3_0)) { out.writeBoolean(true); } out.writeOptionalBoolean(usingBundledJdk); diff --git a/server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java b/server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java index a7be10d87308f..ad0a78fbfbf82 100644 --- a/server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java +++ b/server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java @@ -8,6 +8,7 @@ package org.elasticsearch.monitor.os; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -19,7 +20,7 @@ import java.io.IOException; public class OsInfo implements ReportingService.Info { - private static final Version DOUBLE_PRECISION_ALLOCATED_PROCESSORS_SUPPORT = Version.V_8_5_0; + private static final TransportVersion DOUBLE_PRECISION_ALLOCATED_PROCESSORS_SUPPORT = TransportVersion.V_8_5_0; private final long refreshInterval; private final int availableProcessors; @@ -50,7 +51,7 @@ public OsInfo( public OsInfo(StreamInput in) throws IOException { this.refreshInterval = in.readLong(); this.availableProcessors = in.readInt(); - if (in.getVersion().onOrAfter(DOUBLE_PRECISION_ALLOCATED_PROCESSORS_SUPPORT)) { + if (in.getTransportVersion().onOrAfter(DOUBLE_PRECISION_ALLOCATED_PROCESSORS_SUPPORT)) { this.allocatedProcessors = Processors.readFrom(in); } else { this.allocatedProcessors = Processors.of((double) in.readInt()); @@ -65,7 +66,7 @@ public OsInfo(StreamInput in) throws IOException { public void writeTo(StreamOutput out) throws IOException { out.writeLong(refreshInterval); out.writeInt(availableProcessors); - if (out.getVersion().onOrAfter(DOUBLE_PRECISION_ALLOCATED_PROCESSORS_SUPPORT)) { + if (out.getTransportVersion().onOrAfter(DOUBLE_PRECISION_ALLOCATED_PROCESSORS_SUPPORT)) { allocatedProcessors.writeTo(out); } else { out.writeInt(getAllocatedProcessors()); diff --git a/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java b/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java index 1d56d2f1387fc..3ae8fa927ad92 100644 --- a/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java +++ b/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java @@ -10,6 +10,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -276,7 +277,7 @@ public Mem(StreamInput in) throws IOException { total = 0; } this.total = total; - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0)) { long adjustedTotal = in.readLong(); assert adjustedTotal >= 0 : "expected adjusted total memory to be positive, got: " + adjustedTotal; if (adjustedTotal < 0) { @@ -299,7 +300,7 @@ public Mem(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { out.writeLong(total); - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0)) { out.writeLong(adjustedTotal); } out.writeLong(free); diff --git a/server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java b/server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java index df8cbed44e6f9..47624fbe42c9d 100644 --- a/server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java +++ b/server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java @@ -8,6 +8,7 @@ package org.elasticsearch.plugins; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -45,9 +46,9 @@ public class PluginDescriptor implements Writeable, ToXContentObject { public static final String ES_PLUGIN_POLICY = "plugin-security.policy"; - private static final Version LICENSED_PLUGINS_SUPPORT = Version.V_7_11_0; - private static final Version MODULE_NAME_SUPPORT = Version.V_8_3_0; - private static final Version BOOTSTRAP_SUPPORT_REMOVED = Version.V_8_4_0; + private static final TransportVersion LICENSED_PLUGINS_SUPPORT = TransportVersion.V_7_11_0; + private static final TransportVersion MODULE_NAME_SUPPORT = TransportVersion.V_8_3_0; + private static final TransportVersion BOOTSTRAP_SUPPORT_REMOVED = TransportVersion.V_8_4_0; private final String name; private final String description; @@ -118,7 +119,7 @@ public PluginDescriptor(final StreamInput in) throws IOException { elasticsearchVersion = Version.readVersion(in); javaVersion = in.readString(); this.classname = in.readString(); - if (in.getVersion().onOrAfter(MODULE_NAME_SUPPORT)) { + if (in.getTransportVersion().onOrAfter(MODULE_NAME_SUPPORT)) { this.moduleName = in.readOptionalString(); } else { this.moduleName = null; @@ -126,8 +127,8 @@ public PluginDescriptor(final StreamInput in) throws IOException { extendedPlugins = in.readStringList(); hasNativeController = in.readBoolean(); - if (in.getVersion().onOrAfter(LICENSED_PLUGINS_SUPPORT)) { - if (in.getVersion().before(BOOTSTRAP_SUPPORT_REMOVED)) { + if (in.getTransportVersion().onOrAfter(LICENSED_PLUGINS_SUPPORT)) { + if (in.getTransportVersion().before(BOOTSTRAP_SUPPORT_REMOVED)) { in.readString(); // plugin type in.readOptionalString(); // java opts } @@ -136,7 +137,7 @@ public PluginDescriptor(final StreamInput in) throws IOException { isLicensed = false; } - if (in.getVersion().onOrAfter(Version.V_8_4_0)) { + if (in.getTransportVersion().onOrAfter(Version.V_8_4_0)) { isModular = in.readBoolean(); isStable = in.readBoolean(); } else { @@ -153,20 +154,20 @@ public void writeTo(final StreamOutput out) throws IOException { Version.writeVersion(elasticsearchVersion, out); out.writeString(javaVersion); out.writeString(classname); - if (out.getVersion().onOrAfter(MODULE_NAME_SUPPORT)) { + if (out.getTransportVersion().onOrAfter(MODULE_NAME_SUPPORT)) { out.writeOptionalString(moduleName); } out.writeStringCollection(extendedPlugins); out.writeBoolean(hasNativeController); - if (out.getVersion().onOrAfter(LICENSED_PLUGINS_SUPPORT)) { - if (out.getVersion().before(BOOTSTRAP_SUPPORT_REMOVED)) { + if (out.getTransportVersion().onOrAfter(LICENSED_PLUGINS_SUPPORT)) { + if (out.getTransportVersion().before(BOOTSTRAP_SUPPORT_REMOVED)) { out.writeString("ISOLATED"); out.writeOptionalString(null); } out.writeBoolean(isLicensed); } - if (out.getVersion().onOrAfter(Version.V_8_4_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_4_0)) { out.writeBoolean(isModular); out.writeBoolean(isStable); } diff --git a/server/src/main/java/org/elasticsearch/plugins/PluginRuntimeInfo.java b/server/src/main/java/org/elasticsearch/plugins/PluginRuntimeInfo.java index bf6c077b4de4a..132a7516b9603 100644 --- a/server/src/main/java/org/elasticsearch/plugins/PluginRuntimeInfo.java +++ b/server/src/main/java/org/elasticsearch/plugins/PluginRuntimeInfo.java @@ -8,6 +8,7 @@ package org.elasticsearch.plugins; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -40,7 +41,7 @@ public PluginRuntimeInfo(StreamInput in) throws IOException { } private static Boolean readIsOfficial(StreamInput in) throws IOException { - if (in.getVersion().onOrAfter(Version.V_8_3_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_3_0)) { return in.readBoolean(); } else { return null; @@ -48,7 +49,7 @@ private static Boolean readIsOfficial(StreamInput in) throws IOException { } private static PluginApiInfo readApiInfo(StreamInput in) throws IOException { - if (in.getVersion().onOrAfter(Version.V_8_3_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_3_0)) { return in.readOptionalWriteable(PluginApiInfo::new); } else { return null; @@ -72,7 +73,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws @Override public void writeTo(StreamOutput out) throws IOException { descriptor.writeTo(out); - if (out.getVersion().onOrAfter(Version.V_8_3_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_3_0)) { out.writeBoolean(isOfficial); out.writeOptionalWriteable(pluginApiInfo); } diff --git a/server/src/main/java/org/elasticsearch/script/ScriptContextStats.java b/server/src/main/java/org/elasticsearch/script/ScriptContextStats.java index acde189431c44..c029158697c8b 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptContextStats.java +++ b/server/src/main/java/org/elasticsearch/script/ScriptContextStats.java @@ -8,6 +8,7 @@ package org.elasticsearch.script; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -45,10 +46,10 @@ public ScriptContextStats(StreamInput in) throws IOException { compilations = in.readVLong(); cacheEvictions = in.readVLong(); compilationLimitTriggered = in.readVLong(); - if (in.getVersion().onOrAfter(Version.V_8_1_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_1_0)) { compilationsHistory = new TimeSeries(in); cacheEvictionsHistory = new TimeSeries(in); - } else if (in.getVersion().onOrAfter(Version.V_8_0_0)) { + } else if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0)) { compilationsHistory = new TimeSeries(in).withTotal(compilations); cacheEvictionsHistory = new TimeSeries(in).withTotal(cacheEvictions); } else { @@ -63,7 +64,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVLong(compilations); out.writeVLong(cacheEvictions); out.writeVLong(compilationLimitTriggered); - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0)) { compilationsHistory.writeTo(out); cacheEvictionsHistory.writeTo(out); } diff --git a/server/src/main/java/org/elasticsearch/script/ScriptException.java b/server/src/main/java/org/elasticsearch/script/ScriptException.java index 05a291b6562bc..335cc2cddc0e8 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptException.java +++ b/server/src/main/java/org/elasticsearch/script/ScriptException.java @@ -9,6 +9,7 @@ package org.elasticsearch.script; import org.elasticsearch.ElasticsearchException; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -78,7 +79,7 @@ public ScriptException(StreamInput in) throws IOException { scriptStack = Arrays.asList(in.readStringArray()); script = in.readString(); lang = in.readString(); - if (in.getVersion().onOrAfter(Version.V_7_7_0) && in.readBoolean()) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_7_0) && in.readBoolean()) { pos = new Position(in); } else { pos = null; @@ -91,7 +92,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeStringArray(scriptStack.toArray(new String[0])); out.writeString(script); out.writeString(lang); - if (out.getVersion().onOrAfter(Version.V_7_7_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_7_0)) { if (pos == null) { out.writeBoolean(false); } else { diff --git a/server/src/main/java/org/elasticsearch/script/ScriptStats.java b/server/src/main/java/org/elasticsearch/script/ScriptStats.java index 0b161ff7bca87..37ab3cdd5f3b2 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptStats.java +++ b/server/src/main/java/org/elasticsearch/script/ScriptStats.java @@ -8,6 +8,7 @@ package org.elasticsearch.script; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -76,7 +77,7 @@ public ScriptStats(ScriptContextStats context) { } public ScriptStats(StreamInput in) throws IOException { - if (in.getVersion().onOrAfter(Version.V_8_1_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_1_0)) { compilationsHistory = new TimeSeries(in); cacheEvictionsHistory = new TimeSeries(in); compilations = compilationsHistory.total; @@ -93,7 +94,7 @@ public ScriptStats(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getVersion().onOrAfter(Version.V_8_1_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_1_0)) { compilationsHistory.writeTo(out); cacheEvictionsHistory.writeTo(out); } else { diff --git a/server/src/main/java/org/elasticsearch/script/TimeSeries.java b/server/src/main/java/org/elasticsearch/script/TimeSeries.java index 8399a65a57e08..b93e53a8f2720 100644 --- a/server/src/main/java/org/elasticsearch/script/TimeSeries.java +++ b/server/src/main/java/org/elasticsearch/script/TimeSeries.java @@ -8,6 +8,7 @@ package org.elasticsearch.script; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -49,7 +50,7 @@ public TimeSeries(StreamInput in) throws IOException { fiveMinutes = in.readVLong(); fifteenMinutes = in.readVLong(); twentyFourHours = in.readVLong(); - if (in.getVersion().onOrAfter(Version.V_8_1_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_1_0)) { total = in.readVLong(); } else { total = 0; @@ -70,7 +71,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVLong(fiveMinutes); out.writeVLong(fifteenMinutes); out.writeVLong(twentyFourHours); - if (out.getVersion().onOrAfter(Version.V_8_1_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_1_0)) { out.writeVLong(total); } } diff --git a/server/src/main/java/org/elasticsearch/tasks/TaskCancellationService.java b/server/src/main/java/org/elasticsearch/tasks/TaskCancellationService.java index 5d6fda57b19f0..49c1e55d64b74 100644 --- a/server/src/main/java/org/elasticsearch/tasks/TaskCancellationService.java +++ b/server/src/main/java/org/elasticsearch/tasks/TaskCancellationService.java @@ -12,6 +12,7 @@ import org.apache.logging.log4j.Logger; import org.elasticsearch.ElasticsearchSecurityException; import org.elasticsearch.ExceptionsHelper; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ResultDeduplicator; @@ -294,7 +295,7 @@ private BanParentTaskRequest(StreamInput in) throws IOException { parentTaskId = TaskId.readFromStream(in); ban = in.readBoolean(); reason = ban ? in.readString() : null; - if (in.getVersion().onOrAfter(Version.V_7_8_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_8_0)) { waitForCompletion = in.readBoolean(); } else { waitForCompletion = false; @@ -309,7 +310,7 @@ public void writeTo(StreamOutput out) throws IOException { if (ban) { out.writeString(reason); } - if (out.getVersion().onOrAfter(Version.V_7_8_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_8_0)) { out.writeBoolean(waitForCompletion); } } diff --git a/server/src/main/java/org/elasticsearch/transport/ActionTransportException.java b/server/src/main/java/org/elasticsearch/transport/ActionTransportException.java index 8f6f0fd477b1a..272a71d4d3daf 100644 --- a/server/src/main/java/org/elasticsearch/transport/ActionTransportException.java +++ b/server/src/main/java/org/elasticsearch/transport/ActionTransportException.java @@ -8,6 +8,7 @@ package org.elasticsearch.transport; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -24,7 +25,7 @@ public class ActionTransportException extends TransportException { public ActionTransportException(StreamInput in) throws IOException { super(in); - if (in.getVersion().before(Version.V_8_1_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_1_0)) { in.readOptionalWriteable(TransportAddress::new); in.readOptionalString(); } @@ -45,7 +46,7 @@ public ActionTransportException(String name, InetSocketAddress address, String a @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getVersion().before(Version.V_8_1_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_1_0)) { out.writeMissingWriteable(TransportAddress.class); out.writeMissingString(); // action } diff --git a/server/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java b/server/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java index 1f05adbac0336..aef336ea38397 100644 --- a/server/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java +++ b/server/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java @@ -8,6 +8,7 @@ package org.elasticsearch.transport; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.ReleasableBytesReference; @@ -24,20 +25,20 @@ public class BytesTransportRequest extends TransportRequest implements RefCounted { final ReleasableBytesReference bytes; - private final Version version; + private final TransportVersion version; public BytesTransportRequest(StreamInput in) throws IOException { super(in); bytes = in.readReleasableBytesReference(); - version = in.getVersion(); + version = in.getTransportVersion(); } - public BytesTransportRequest(ReleasableBytesReference bytes, Version version) { + public BytesTransportRequest(ReleasableBytesReference bytes, TransportVersion version) { this.bytes = bytes; this.version = version; } - public Version version() { + public TransportVersion version() { return this.version; } diff --git a/server/src/main/java/org/elasticsearch/transport/ConnectTransportException.java b/server/src/main/java/org/elasticsearch/transport/ConnectTransportException.java index eddd6d6f108ba..1469d14c29d71 100644 --- a/server/src/main/java/org/elasticsearch/transport/ConnectTransportException.java +++ b/server/src/main/java/org/elasticsearch/transport/ConnectTransportException.java @@ -8,6 +8,7 @@ package org.elasticsearch.transport; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.io.stream.StreamInput; @@ -35,7 +36,7 @@ public ConnectTransportException(DiscoveryNode node, String msg, String action, public ConnectTransportException(StreamInput in) throws IOException { super(in); - if (in.getVersion().before(Version.V_8_1_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_1_0)) { in.readOptionalWriteable(DiscoveryNode::new); } } @@ -43,7 +44,7 @@ public ConnectTransportException(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getVersion().before(Version.V_8_1_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_1_0)) { out.writeMissingWriteable(DiscoveryNode.class); } } diff --git a/server/src/main/java/org/elasticsearch/transport/ProxyConnectionStrategy.java b/server/src/main/java/org/elasticsearch/transport/ProxyConnectionStrategy.java index d49e760ab85ab..a410f0e912f8e 100644 --- a/server/src/main/java/org/elasticsearch/transport/ProxyConnectionStrategy.java +++ b/server/src/main/java/org/elasticsearch/transport/ProxyConnectionStrategy.java @@ -8,6 +8,7 @@ package org.elasticsearch.transport; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; @@ -316,7 +317,7 @@ public ProxyModeInfo(String address, String serverName, int maxSocketConnections private ProxyModeInfo(StreamInput input) throws IOException { address = input.readString(); - if (input.getVersion().onOrAfter(Version.V_7_7_0)) { + if (input.getTransportVersion().onOrAfter(TransportVersion.V_7_7_0)) { serverName = input.readString(); } else { serverName = null; @@ -337,7 +338,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(address); - if (out.getVersion().onOrAfter(Version.V_7_7_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_7_0)) { out.writeString(serverName); } out.writeVInt(maxSocketConnections); diff --git a/server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java b/server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java index fbbd2483e6939..62c237cc2be23 100644 --- a/server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java +++ b/server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java @@ -8,6 +8,7 @@ package org.elasticsearch.transport; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -40,7 +41,7 @@ public RemoteConnectionInfo(String clusterAlias, ModeInfo modeInfo, TimeValue in } public RemoteConnectionInfo(StreamInput input) throws IOException { - if (input.getVersion().onOrAfter(Version.V_7_6_0)) { + if (input.getTransportVersion().onOrAfter(TransportVersion.V_7_6_0)) { RemoteConnectionStrategy.ConnectionStrategy mode = input.readEnum(RemoteConnectionStrategy.ConnectionStrategy.class); modeInfo = mode.getReader().read(input); initialConnectionTimeout = input.readTimeValue(); @@ -79,7 +80,7 @@ public boolean isSkipUnavailable() { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getVersion().onOrAfter(Version.V_7_6_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_6_0)) { out.writeEnum(modeInfo.modeType()); modeInfo.writeTo(out); out.writeTimeValue(initialConnectionTimeout); diff --git a/server/src/main/java/org/elasticsearch/transport/TransportStats.java b/server/src/main/java/org/elasticsearch/transport/TransportStats.java index fe0f1742f9eb6..694fb0628d145 100644 --- a/server/src/main/java/org/elasticsearch/transport/TransportStats.java +++ b/server/src/main/java/org/elasticsearch/transport/TransportStats.java @@ -8,6 +8,7 @@ package org.elasticsearch.transport; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -59,7 +60,7 @@ public TransportStats(StreamInput in) throws IOException { rxSize = in.readVLong(); txCount = in.readVLong(); txSize = in.readVLong(); - if (in.getVersion().onOrAfter(Version.V_8_1_0) && in.readBoolean()) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_1_0) && in.readBoolean()) { inboundHandlingTimeBucketFrequencies = new long[HandlingTimeTracker.BUCKET_COUNT]; for (int i = 0; i < inboundHandlingTimeBucketFrequencies.length; i++) { inboundHandlingTimeBucketFrequencies[i] = in.readVLong(); @@ -83,7 +84,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVLong(rxSize); out.writeVLong(txCount); out.writeVLong(txSize); - if (out.getVersion().onOrAfter(Version.V_8_1_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_1_0)) { assert (inboundHandlingTimeBucketFrequencies.length > 0) == (outboundHandlingTimeBucketFrequencies.length > 0); out.writeBoolean(inboundHandlingTimeBucketFrequencies.length > 0); for (long handlingTimeBucketFrequency : inboundHandlingTimeBucketFrequencies) { diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DesiredNodeTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DesiredNodeTests.java index 5451da0c22351..826edafbae354 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/DesiredNodeTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/DesiredNodeTests.java @@ -8,6 +8,7 @@ package org.elasticsearch.cluster.metadata; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.cluster.node.DiscoveryNodeRole; import org.elasticsearch.common.settings.Settings; @@ -201,8 +202,8 @@ public void testDesiredNodeIsCompatible() { ByteSizeValue.ofGb(1), Version.CURRENT ); - assertThat(desiredNode.isCompatibleWithVersion(Version.V_8_2_0), is(equalTo(false))); - assertThat(desiredNode.isCompatibleWithVersion(Version.V_8_3_0), is(equalTo(true))); + assertThat(desiredNode.isCompatibleWithVersion(TransportVersion.V_8_2_0), is(equalTo(false))); + assertThat(desiredNode.isCompatibleWithVersion(TransportVersion.V_8_3_0), is(equalTo(true))); } { @@ -213,14 +214,14 @@ public void testDesiredNodeIsCompatible() { ByteSizeValue.ofGb(1), Version.CURRENT ); - assertThat(desiredNode.isCompatibleWithVersion(Version.V_8_2_0), is(equalTo(false))); - assertThat(desiredNode.isCompatibleWithVersion(Version.V_8_3_0), is(equalTo(true))); + assertThat(desiredNode.isCompatibleWithVersion(TransportVersion.V_8_2_0), is(equalTo(false))); + assertThat(desiredNode.isCompatibleWithVersion(TransportVersion.V_8_3_0), is(equalTo(true))); } { final var desiredNode = new DesiredNode(settings, 2.0f, ByteSizeValue.ofGb(1), ByteSizeValue.ofGb(1), Version.CURRENT); - assertThat(desiredNode.isCompatibleWithVersion(Version.V_8_2_0), is(equalTo(true))); - assertThat(desiredNode.isCompatibleWithVersion(Version.V_8_3_0), is(equalTo(true))); + assertThat(desiredNode.isCompatibleWithVersion(TransportVersion.V_8_2_0), is(equalTo(true))); + assertThat(desiredNode.isCompatibleWithVersion(TransportVersion.V_8_3_0), is(equalTo(true))); } } diff --git a/server/src/test/java/org/elasticsearch/common/io/stream/DelayableWriteableTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/DelayableWriteableTests.java index 5fd585cdb35b0..be1888d189fa2 100644 --- a/server/src/test/java/org/elasticsearch/common/io/stream/DelayableWriteableTests.java +++ b/server/src/test/java/org/elasticsearch/common/io/stream/DelayableWriteableTests.java @@ -8,8 +8,10 @@ package org.elasticsearch.common.io.stream; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.test.ESTestCase; +import org.elasticsearch.test.TransportVersionUtils; import org.elasticsearch.test.VersionUtils; import java.io.IOException; @@ -87,19 +89,19 @@ public int hashCode() { } private static class SneakOtherSideVersionOnWire implements Writeable { - private final Version version; + private final TransportVersion version; SneakOtherSideVersionOnWire() { - version = Version.CURRENT; + version = TransportVersion.CURRENT; } SneakOtherSideVersionOnWire(StreamInput in) throws IOException { - version = Version.readVersion(in); + version = TransportVersion.readVersion(in); } @Override public void writeTo(StreamOutput out) throws IOException { - Version.writeVersion(out.getVersion(), out); + TransportVersion.writeVersion(out.getTransportVersion(), out); } } @@ -144,7 +146,7 @@ public void testRoundTripFromDelayedFromOldVersionWithNamedWriteable() throws IO } public void testSerializesWithRemoteVersion() throws IOException { - Version remoteVersion = VersionUtils.randomCompatibleVersion(random(), Version.CURRENT); + TransportVersion remoteVersion = TransportVersionUtils.randomCompatibleVersion(random(), TransportVersion.CURRENT); DelayableWriteable original = DelayableWriteable.referencing(new SneakOtherSideVersionOnWire()); assertThat(roundTrip(original, SneakOtherSideVersionOnWire::new, remoteVersion).expand().version, equalTo(remoteVersion)); } @@ -157,14 +159,14 @@ public void testAsSerializedIsNoopOnSerialized() throws IOException { } private void roundTripTestCase(DelayableWriteable original, Writeable.Reader reader) throws IOException { - DelayableWriteable roundTripped = roundTrip(original, reader, Version.CURRENT); + DelayableWriteable roundTripped = roundTrip(original, reader, TransportVersion.CURRENT); assertThat(roundTripped.expand(), equalTo(original.expand())); } private DelayableWriteable roundTrip( DelayableWriteable original, Writeable.Reader reader, - Version version + TransportVersion version ) throws IOException { DelayableWriteable delayed = copyInstance( original, @@ -192,7 +194,7 @@ protected NamedWriteableRegistry writableRegistry() { return new NamedWriteableRegistry(singletonList(new NamedWriteableRegistry.Entry(Example.class, "example", Example::new))); } - private static Version randomOldVersion() { - return randomValueOtherThanMany(Version.CURRENT::before, () -> VersionUtils.randomCompatibleVersion(random(), Version.CURRENT)); + private static TransportVersion randomOldVersion() { + return randomValueOtherThanMany(TransportVersion.CURRENT::before, () -> TransportVersionUtils.randomCompatibleVersion(random(), TransportVersion.CURRENT)); } } diff --git a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java index 04ebb70ec328c..0ffe21cd76c78 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java @@ -10,6 +10,7 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ResourceNotFoundException; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.bulk.BulkItemResponse.Failure; import org.elasticsearch.client.internal.transport.NoNodeAvailableException; @@ -82,7 +83,7 @@ private List randomSearchFailures() { private void assertResponseEquals(BulkByScrollResponse expected, BulkByScrollResponse actual) { assertEquals(expected.getTook(), actual.getTook()); - BulkByScrollTaskStatusTests.assertTaskStatusEquals(Version.CURRENT, expected.getStatus(), actual.getStatus()); + BulkByScrollTaskStatusTests.assertTaskStatusEquals(TransportVersion.CURRENT, expected.getStatus(), actual.getStatus()); assertEquals(expected.getBulkFailures().size(), actual.getBulkFailures().size()); for (int i = 0; i < expected.getBulkFailures().size(); i++) { Failure expectedFailure = expected.getBulkFailures().get(i); diff --git a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java index b341e8c3503c5..6ccf8d95ec66a 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java @@ -10,6 +10,7 @@ import org.apache.lucene.tests.util.LuceneTestCase; import org.elasticsearch.ElasticsearchException; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.Randomness; import org.elasticsearch.common.Strings; @@ -44,14 +45,14 @@ public void testBulkByTaskStatus() throws IOException { BytesStreamOutput out = new BytesStreamOutput(); status.writeTo(out); BulkByScrollTask.Status tripped = new BulkByScrollTask.Status(out.bytes().streamInput()); - assertTaskStatusEquals(out.getVersion(), status, tripped); + assertTaskStatusEquals(out.getTransportVersion(), status, tripped); } /** * Assert that two task statuses are equal after serialization. * @param version the version at which expected was serialized */ - public static void assertTaskStatusEquals(Version version, BulkByScrollTask.Status expected, BulkByScrollTask.Status actual) { + public static void assertTaskStatusEquals(TransportVersion version, BulkByScrollTask.Status expected, BulkByScrollTask.Status actual) { assertEquals(expected.getTotal(), actual.getTotal()); assertEquals(expected.getUpdated(), actual.getUpdated()); assertEquals(expected.getCreated(), actual.getCreated()); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/GetFeatureUsageResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/GetFeatureUsageResponse.java index 8a91c9b0d2456..dfc6a7ae8ad73 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/GetFeatureUsageResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/GetFeatureUsageResponse.java @@ -7,6 +7,7 @@ package org.elasticsearch.license; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamInput; @@ -48,14 +49,14 @@ public FeatureUsageInfo( } public FeatureUsageInfo(StreamInput in) throws IOException { - if (in.getVersion().onOrAfter(Version.V_7_16_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_16_0)) { this.family = in.readOptionalString(); } else { this.family = null; } this.name = in.readString(); this.lastUsedTime = ZonedDateTime.ofInstant(Instant.ofEpochSecond(in.readLong()), ZoneOffset.UTC); - if (in.getVersion().onOrAfter(Version.V_7_15_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_15_0)) { this.context = in.readOptionalString(); } else { this.context = null; @@ -65,12 +66,12 @@ public FeatureUsageInfo(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getVersion().onOrAfter(Version.V_7_16_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_16_0)) { out.writeOptionalString(this.family); } out.writeString(name); out.writeLong(lastUsedTime.toEpochSecond()); - if (out.getVersion().onOrAfter(Version.V_7_15_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_15_0)) { out.writeOptionalString(this.context); } out.writeString(licenseLevel); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoRequest.java index 9889a88c91382..dca4352690bd6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoRequest.java @@ -6,7 +6,7 @@ */ package org.elasticsearch.protocol.xpack; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.common.io.stream.StreamInput; @@ -57,7 +57,7 @@ public XPackInfoRequest(StreamInput in) throws IOException { categories.add(Category.valueOf(in.readString())); } this.categories = categories; - if (hasLicenseVersionField(in.getVersion())) { + if (hasLicenseVersionField(in.getTransportVersion())) { int ignoredLicenseVersion = in.readVInt(); } } @@ -91,12 +91,12 @@ public void writeTo(StreamOutput out) throws IOException { for (Category category : categories) { out.writeString(category.name()); } - if (hasLicenseVersionField(out.getVersion())) { + if (hasLicenseVersionField(out.getTransportVersion())) { out.writeVInt(License.VERSION_CURRENT); } } - private static boolean hasLicenseVersionField(Version streamVersion) { - return streamVersion.onOrAfter(Version.V_7_8_1) && streamVersion.before(Version.V_8_0_0); + private static boolean hasLicenseVersionField(TransportVersion streamVersion) { + return streamVersion.onOrAfter(TransportVersion.V_7_8_1) && streamVersion.before(TransportVersion.V_8_0_0); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java index 05fffeca9cc2b..2d6f789eca18d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java @@ -6,6 +6,7 @@ */ package org.elasticsearch.protocol.xpack; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.Strings; @@ -362,7 +363,7 @@ public FeatureSet(String name, boolean available, boolean enabled) { public FeatureSet(StreamInput in) throws IOException { this(in.readString(), readAvailable(in), in.readBoolean()); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { in.readMap(); // backcompat reading native code info, but no longer used here } } @@ -370,7 +371,7 @@ public FeatureSet(StreamInput in) throws IOException { // this is separated out so that the removed description can be read from the stream on construction // TODO: remove this for 8.0 private static boolean readAvailable(StreamInput in) throws IOException { - if (in.getVersion().before(Version.V_7_3_0)) { + if (in.getTransportVersion().before(TransportVersion.V_7_3_0)) { in.readOptionalString(); } return in.readBoolean(); @@ -379,12 +380,12 @@ private static boolean readAvailable(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(name); - if (out.getVersion().before(Version.V_7_3_0)) { + if (out.getTransportVersion().before(TransportVersion.V_7_3_0)) { out.writeOptionalString(null); } out.writeBoolean(available); out.writeBoolean(enabled); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeGenericMap(Collections.emptyMap()); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/GraphExploreRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/GraphExploreRequest.java index a2f73fcab266a..ddad443515541 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/GraphExploreRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/GraphExploreRequest.java @@ -6,6 +6,7 @@ */ package org.elasticsearch.protocol.xpack.graph; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; @@ -111,7 +112,7 @@ public GraphExploreRequest(StreamInput in) throws IOException { indices = in.readStringArray(); indicesOptions = IndicesOptions.readIndicesOptions(in); - if (in.getVersion().before(Version.V_8_0_0)) { + if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) { String[] types = in.readStringArray(); assert types.length == 0; } @@ -180,7 +181,7 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeStringArray(indices); indicesOptions.writeIndicesOptions(out); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeStringArray(Strings.EMPTY_ARRAY); } out.writeOptionalString(routing); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleExplainResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleExplainResponse.java index 7ff06b3fe9049..b2ed0c267230d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleExplainResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleExplainResponse.java @@ -353,7 +353,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(repositoryName); out.writeOptionalString(snapshotName); out.writeOptionalString(shrinkIndexName); - if (out.getVersion().onOrAfter(Version.V_8_1_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_1_0)) { out.writeOptionalLong(indexCreationDate); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleFeatureSetUsage.java index d160341b5f38d..2ef08a4a62d71 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleFeatureSetUsage.java @@ -457,10 +457,10 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalVInt(setPriorityPriority); out.writeOptionalWriteable(shrinkMaxPrimaryShardSize); out.writeOptionalVInt(shrinkNumberOfShards); - if (out.getVersion().onOrAfter(Version.V_8_2_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_2_0)) { out.writeOptionalVLong(rolloverMaxPrimaryShardDocs); } - if (out.getVersion().onOrAfter(Version.V_8_4_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_4_0)) { out.writeOptionalTimeValue(rolloverMinAge); out.writeOptionalVLong(rolloverMinDocs); out.writeOptionalWriteable(rolloverMinPrimaryShardSize); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/RolloverAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/RolloverAction.java index 4d74afbcccd99..22bf525a83a6c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/RolloverAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/RolloverAction.java @@ -188,10 +188,10 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(maxPrimaryShardSize); out.writeOptionalTimeValue(maxAge); out.writeOptionalVLong(maxDocs); - if (out.getVersion().onOrAfter(Version.V_8_2_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_2_0)) { out.writeOptionalVLong(maxPrimaryShardDocs); } - if (out.getVersion().onOrAfter(Version.V_8_4_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_4_0)) { out.writeOptionalWriteable(minSize); out.writeOptionalWriteable(minPrimaryShardSize); out.writeOptionalTimeValue(minAge); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/IndexerJobStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/IndexerJobStats.java index 394f3cbe47d17..ea0170ed5e8a6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/IndexerJobStats.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/IndexerJobStats.java @@ -206,7 +206,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVLong(searchTotal); out.writeVLong(indexFailures); out.writeVLong(searchFailures); - if (out.getVersion().onOrAfter(Version.V_7_7_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_7_0)) { out.writeVLong(processingTime); out.writeVLong(processingTotal); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java index aff6188a34c56..b4e3d549c6981 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java @@ -6,6 +6,7 @@ */ package org.elasticsearch.xpack.core.transform.transforms.pivot; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.common.Rounding; import org.elasticsearch.common.io.stream.StreamInput; @@ -228,7 +229,7 @@ public DateHistogramGroupSource(StreamInput in) throws IOException { super(in); this.interval = readInterval(in); this.timeZone = in.readOptionalZoneId(); - if (in.getVersion().onOrAfter(Version.V_8_7_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_7_0)) { this.offset = in.readLong(); } else { this.offset = 0; @@ -331,7 +332,7 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); writeInterval(interval, out); out.writeOptionalZoneId(timeZone); - if (out.getVersion().onOrAfter(Version.V_8_7_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_7_0)) { out.writeLong(offset); } } diff --git a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequestTests.java b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequestTests.java index 67a25ecdb1c2c..37fe08b302e7d 100644 --- a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequestTests.java +++ b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequestTests.java @@ -237,7 +237,7 @@ public void testSerialization() throws IOException { originalRequest.writeTo(out); final StreamInput in = out.bytes().streamInput(); - in.setVersion(out.getVersion()); + in.setTransportVersion(out.getTransportVersion()); final MonitoringBulkRequest deserializedRequest = new MonitoringBulkRequest(in); diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/BlobAnalyzeAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/BlobAnalyzeAction.java index 5109166a22c48..256984eaf751b 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/BlobAnalyzeAction.java +++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/BlobAnalyzeAction.java @@ -9,6 +9,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListenerResponseHandler; @@ -676,7 +677,7 @@ public static class Request extends ActionRequest implements TaskAwareRequest { earlyReadNodeCount = in.readVInt(); readEarly = in.readBoolean(); writeAndOverwrite = in.readBoolean(); - if (in.getVersion().onOrAfter(Version.V_7_14_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_14_0)) { abortWrite = in.readBoolean(); } else { abortWrite = false; @@ -696,10 +697,10 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVInt(earlyReadNodeCount); out.writeBoolean(readEarly); out.writeBoolean(writeAndOverwrite); - if (out.getVersion().onOrAfter(Version.V_7_14_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_14_0)) { out.writeBoolean(abortWrite); } else if (abortWrite) { - throw new IllegalStateException("cannot send abortWrite request to node of version [" + out.getVersion() + "]"); + throw new IllegalStateException("cannot send abortWrite request on transport version [" + out.getTransportVersion() + "]"); } } diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/RepositoryAnalyzeAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/RepositoryAnalyzeAction.java index 43030941e8028..afd045da69960 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/RepositoryAnalyzeAction.java +++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/RepositoryAnalyzeAction.java @@ -10,6 +10,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.ExceptionsHelper; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListenerResponseHandler; @@ -673,7 +674,7 @@ public Request(StreamInput in) throws IOException { maxTotalDataSize = ByteSizeValue.readFrom(in); detailed = in.readBoolean(); reroutedFrom = in.readOptionalWriteable(DiscoveryNode::new); - if (in.getVersion().onOrAfter(Version.V_7_14_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_7_14_0)) { abortWritePermitted = in.readBoolean(); } else { abortWritePermitted = false; @@ -700,10 +701,10 @@ public void writeTo(StreamOutput out) throws IOException { maxTotalDataSize.writeTo(out); out.writeBoolean(detailed); out.writeOptionalWriteable(reroutedFrom); - if (out.getVersion().onOrAfter(Version.V_7_14_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_14_0)) { out.writeBoolean(abortWritePermitted); } else if (abortWritePermitted) { - throw new IllegalStateException("cannot send abortWritePermitted request to node of version [" + out.getVersion() + "]"); + throw new IllegalStateException("cannot send abortWritePermitted request on transport version [" + out.getTransportVersion() + "]"); } } From 7d6234774240e6b5b78199f677acf1da380bf1dc Mon Sep 17 00:00:00 2001 From: Simon Cooper Date: Thu, 26 Jan 2023 14:37:00 +0000 Subject: [PATCH 2/5] More TransportVersion migrations --- .../ingest/common/GrokProcessorGetAction.java | 1 - .../geoip/stats/GeoIpDownloaderStatsAction.java | 1 - .../mustache/MultiSearchTemplateResponse.java | 1 - .../desirednodes/UpdateDesiredNodesRequest.java | 1 - .../admin/cluster/node/info/PluginsAndModules.java | 4 ++-- .../action/admin/indices/rollover/Condition.java | 4 ++-- .../rollover/MaxPrimaryShardDocsCondition.java | 6 +++--- .../admin/indices/rollover/MinAgeCondition.java | 6 +++--- .../admin/indices/rollover/MinDocsCondition.java | 6 +++--- .../rollover/MinPrimaryShardDocsCondition.java | 6 +++--- .../rollover/MinPrimaryShardSizeCondition.java | 6 +++--- .../admin/indices/rollover/MinSizeCondition.java | 6 +++--- .../admin/indices/rollover/RolloverRequest.java | 2 +- .../action/bulk/BulkItemResponse.java | 3 +-- .../action/explain/ExplainRequest.java | 3 +-- .../action/explain/ExplainResponse.java | 3 +-- .../cluster/metadata/RepositoryMetadata.java | 4 ++-- .../common/document/DocumentField.java | 1 - .../common/xcontent/XContentHelper.java | 1 - .../elasticsearch/discovery/DiscoveryStats.java | 1 - .../TransportNodesListGatewayStartedShards.java | 1 - .../org/elasticsearch/index/translog/Translog.java | 9 ++++++--- .../java/org/elasticsearch/monitor/os/OsInfo.java | 1 - .../java/org/elasticsearch/monitor/os/OsStats.java | 1 - .../elasticsearch/plugins/PluginRuntimeInfo.java | 1 - .../elasticsearch/script/ScriptContextStats.java | 1 - .../org/elasticsearch/script/ScriptException.java | 1 - .../java/org/elasticsearch/script/ScriptStats.java | 1 - .../java/org/elasticsearch/script/TimeSeries.java | 1 - .../tasks/TaskCancellationService.java | 1 - .../transport/ActionTransportException.java | 1 - .../transport/BytesTransportRequest.java | 1 - .../transport/ConnectTransportException.java | 1 - .../transport/RemoteConnectionInfo.java | 1 - .../elasticsearch/action/OriginalIndicesTests.java | 10 +++++----- .../storedscripts/GetStoredScriptRequestTests.java | 6 +++--- .../resolve/TransportResolveIndexActionTests.java | 7 +++++-- .../TransportFieldCapabilitiesActionTests.java | 7 +++++-- .../action/get/MultiGetShardRequestTests.java | 14 +++++++------- .../common/io/stream/DelayableWriteableTests.java | 7 ++++--- .../index/reindex/BulkByScrollResponseTests.java | 1 - .../index/reindex/BulkByScrollTaskStatusTests.java | 1 - .../license/GetFeatureUsageResponse.java | 1 - .../protocol/xpack/XPackInfoResponse.java | 1 - .../protocol/xpack/graph/GraphExploreRequest.java | 1 - .../core/ilm/IndexLifecycleExplainResponse.java | 1 - .../core/ilm/IndexLifecycleFeatureSetUsage.java | 1 - .../xpack/core/ilm/RolloverAction.java | 1 - .../xpack/core/indexing/IndexerJobStats.java | 1 - .../transforms/pivot/DateHistogramGroupSource.java | 1 - .../blobstore/testkit/BlobAnalyzeAction.java | 1 - .../blobstore/testkit/RepositoryAnalyzeAction.java | 5 +++-- 52 files changed, 66 insertions(+), 89 deletions(-) diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java index 10d9179786b73..43163cc92ed96 100644 --- a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java +++ b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java @@ -8,7 +8,6 @@ package org.elasticsearch.ingest.common; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsAction.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsAction.java index c65946de25efc..228758e886c69 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsAction.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsAction.java @@ -9,7 +9,6 @@ package org.elasticsearch.ingest.geoip.stats; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.FailedNodeException; import org.elasticsearch.action.support.nodes.BaseNodeResponse; diff --git a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateResponse.java b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateResponse.java index 5c890c205ffd8..f426480155356 100644 --- a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateResponse.java +++ b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateResponse.java @@ -11,7 +11,6 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.search.MultiSearchResponse; import org.elasticsearch.common.Strings; diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java index 092b015aa1f2d..825db3c31a998 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.admin.cluster.desirednodes; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.action.support.master.AcknowledgedRequest; diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java index 974e90b11d8dd..e6a91b152cad5 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.cluster.node.info; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.node.ReportingService; @@ -41,7 +41,7 @@ public PluginsAndModules(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getVersion().onOrAfter(Version.V_8_3_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_3_0)) { out.writeList(plugins); } else { out.writeList(plugins.stream().map(PluginRuntimeInfo::descriptor).toList()); diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java index b61e73bbfa26b..ba7d6b03043c5 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.indices.rollover; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.io.stream.NamedWriteable; import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.xcontent.ToXContentFragment; @@ -41,7 +41,7 @@ protected Condition(String name, Type type) { * Checks if this condition is available in a specific version. * This makes sure BWC when introducing a new condition which is not recognized by older versions. */ - boolean includedInVersion(Version version) { + boolean includedInVersion(TransportVersion version) { return true; } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxPrimaryShardDocsCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxPrimaryShardDocsCondition.java index c27b4a7b7e739..678ec96c217ca 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxPrimaryShardDocsCondition.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxPrimaryShardDocsCondition.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.indices.rollover; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.XContentBuilder; @@ -62,7 +62,7 @@ public static MaxPrimaryShardDocsCondition fromXContent(XContentParser parser) t } @Override - boolean includedInVersion(Version version) { - return version.onOrAfter(Version.V_8_2_0); + boolean includedInVersion(TransportVersion version) { + return version.onOrAfter(TransportVersion.V_8_2_0); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinAgeCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinAgeCondition.java index ddcfadd53dd74..98958d3b015c7 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinAgeCondition.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinAgeCondition.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.indices.rollover; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.TimeValue; @@ -64,7 +64,7 @@ public static MinAgeCondition fromXContent(XContentParser parser) throws IOExcep } @Override - boolean includedInVersion(Version version) { - return version.onOrAfter(Version.V_8_4_0); + boolean includedInVersion(TransportVersion version) { + return version.onOrAfter(TransportVersion.V_8_4_0); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinDocsCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinDocsCondition.java index 9a4fffc17018f..8c6274cfadb81 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinDocsCondition.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinDocsCondition.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.indices.rollover; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.XContentBuilder; @@ -62,7 +62,7 @@ public static MinDocsCondition fromXContent(XContentParser parser) throws IOExce } @Override - boolean includedInVersion(Version version) { - return version.onOrAfter(Version.V_8_4_0); + boolean includedInVersion(TransportVersion version) { + return version.onOrAfter(TransportVersion.V_8_4_0); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinPrimaryShardDocsCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinPrimaryShardDocsCondition.java index e1aee305742f3..6aaea57e5b55b 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinPrimaryShardDocsCondition.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinPrimaryShardDocsCondition.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.indices.rollover; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.XContentBuilder; @@ -62,7 +62,7 @@ public static MinPrimaryShardDocsCondition fromXContent(XContentParser parser) t } @Override - boolean includedInVersion(Version version) { - return version.onOrAfter(Version.V_8_4_0); + boolean includedInVersion(TransportVersion version) { + return version.onOrAfter(TransportVersion.V_8_4_0); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinPrimaryShardSizeCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinPrimaryShardSizeCondition.java index 5ec8d26d9672a..d7149e2a91be4 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinPrimaryShardSizeCondition.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinPrimaryShardSizeCondition.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.indices.rollover; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.unit.ByteSizeValue; @@ -63,7 +63,7 @@ public static MinPrimaryShardSizeCondition fromXContent(XContentParser parser) t } @Override - boolean includedInVersion(Version version) { - return version.onOrAfter(Version.V_8_4_0); + boolean includedInVersion(TransportVersion version) { + return version.onOrAfter(TransportVersion.V_8_4_0); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinSizeCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinSizeCondition.java index 82cf3c0daf301..52db7ff90cf26 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinSizeCondition.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinSizeCondition.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.admin.indices.rollover; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.unit.ByteSizeValue; @@ -63,7 +63,7 @@ public static MinSizeCondition fromXContent(XContentParser parser) throws IOExce } @Override - boolean includedInVersion(Version version) { - return version.onOrAfter(Version.V_8_4_0); + boolean includedInVersion(TransportVersion version) { + return version.onOrAfter(TransportVersion.V_8_4_0); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java index 9916acbef125f..fd773a9e19b58 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java @@ -212,7 +212,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(newIndexName); out.writeBoolean(dryRun); out.writeCollection( - conditions.values().stream().filter(c -> c.includedInVersion(out.getVersion())).toList(), + conditions.values().stream().filter(c -> c.includedInVersion(out.getTransportVersion())).toList(), StreamOutput::writeNamedWriteable ); createIndexRequest.writeTo(out); diff --git a/server/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java index 1f140be7522ad..b5894d322b90e 100644 --- a/server/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java +++ b/server/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java @@ -11,7 +11,6 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.action.DocWriteRequest.OpType; import org.elasticsearch.action.DocWriteResponse; import org.elasticsearch.action.delete.DeleteResponse; @@ -254,7 +253,7 @@ public Failure(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(index); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeString(MapperService.SINGLE_MAPPING_NAME); } out.writeOptionalString(id); diff --git a/server/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java b/server/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java index 43a00accdb998..685eb0b8a1995 100644 --- a/server/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java +++ b/server/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.explain; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.action.support.single.shard.SingleShardRequest; @@ -161,7 +160,7 @@ public ActionRequestValidationException validate() { @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeString(MapperService.SINGLE_MAPPING_NAME); } out.writeString(id); diff --git a/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java b/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java index 880ed44db4460..97c56069fa762 100644 --- a/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java +++ b/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java @@ -10,7 +10,6 @@ import org.apache.lucene.search.Explanation; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -119,7 +118,7 @@ public RestStatus status() { @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(index); - if (out.getVersion().before(Version.V_8_0_0)) { + if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) { out.writeString(MapperService.SINGLE_MAPPING_NAME); } out.writeString(id); diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetadata.java index 7790e265220ae..66e339a474ed7 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetadata.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetadata.java @@ -129,7 +129,7 @@ public long pendingGeneration() { public RepositoryMetadata(StreamInput in) throws IOException { name = in.readString(); - if (in.getVersion().onOrAfter(SnapshotsService.UUIDS_IN_REPO_DATA_VERSION)) { + if (in.getTransportVersion().onOrAfter(SnapshotsService.UUIDS_IN_REPO_DATA_VERSION.transportVersion)) { uuid = in.readString(); } else { uuid = RepositoryData.MISSING_UUID; @@ -148,7 +148,7 @@ public RepositoryMetadata(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(name); - if (out.getVersion().onOrAfter(SnapshotsService.UUIDS_IN_REPO_DATA_VERSION)) { + if (out.getTransportVersion().onOrAfter(SnapshotsService.UUIDS_IN_REPO_DATA_VERSION.transportVersion)) { out.writeString(uuid); } out.writeString(type); diff --git a/server/src/main/java/org/elasticsearch/common/document/DocumentField.java b/server/src/main/java/org/elasticsearch/common/document/DocumentField.java index 07bf6197efe37..5828b485ce36d 100644 --- a/server/src/main/java/org/elasticsearch/common/document/DocumentField.java +++ b/server/src/main/java/org/elasticsearch/common/document/DocumentField.java @@ -9,7 +9,6 @@ package org.elasticsearch.common.document; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java index 6dd913e932784..fda5055e5585a 100644 --- a/server/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java +++ b/server/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java @@ -11,7 +11,6 @@ import org.elasticsearch.ElasticsearchGenerationException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; diff --git a/server/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java b/server/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java index cb10cdc1cea44..8d1368555a72c 100644 --- a/server/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java +++ b/server/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java @@ -9,7 +9,6 @@ package org.elasticsearch.discovery; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.cluster.coordination.PendingClusterStateStats; import org.elasticsearch.cluster.coordination.PublishClusterStateStats; import org.elasticsearch.cluster.service.ClusterApplierRecordingService; diff --git a/server/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java b/server/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java index 356d6c23d1468..8fc67c3a3195f 100644 --- a/server/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java +++ b/server/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java @@ -12,7 +12,6 @@ import org.apache.logging.log4j.Logger; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.FailedNodeException; import org.elasticsearch.action.support.ActionFilters; diff --git a/server/src/main/java/org/elasticsearch/index/translog/Translog.java b/server/src/main/java/org/elasticsearch/index/translog/Translog.java index 1dad9ea9b5bb3..8eba045ee3cc8 100644 --- a/server/src/main/java/org/elasticsearch/index/translog/Translog.java +++ b/server/src/main/java/org/elasticsearch/index/translog/Translog.java @@ -10,7 +10,6 @@ import org.apache.lucene.store.AlreadyClosedException; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.UUIDs; import org.elasticsearch.common.bytes.BytesReference; @@ -1241,7 +1240,9 @@ public long version() { } private void write(final StreamOutput out) throws IOException { - final int format = out.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0) ? SERIALIZATION_FORMAT : FORMAT_NO_VERSION_TYPE; + final int format = out.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0) + ? SERIALIZATION_FORMAT + : FORMAT_NO_VERSION_TYPE; out.writeVInt(format); out.writeString(id); if (format < FORMAT_NO_DOC_TYPE) { @@ -1402,7 +1403,9 @@ public BytesReference source() { } private void write(final StreamOutput out) throws IOException { - final int format = out.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0) ? SERIALIZATION_FORMAT : FORMAT_NO_VERSION_TYPE; + final int format = out.getTransportVersion().onOrAfter(TransportVersion.V_8_0_0) + ? SERIALIZATION_FORMAT + : FORMAT_NO_VERSION_TYPE; out.writeVInt(format); if (format < FORMAT_NO_DOC_TYPE) { out.writeString(MapperService.SINGLE_MAPPING_NAME); diff --git a/server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java b/server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java index ad0a78fbfbf82..d956ee4f6852c 100644 --- a/server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java +++ b/server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java @@ -9,7 +9,6 @@ package org.elasticsearch.monitor.os; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.unit.Processors; diff --git a/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java b/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java index 3ae8fa927ad92..dab3eb100e9fb 100644 --- a/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java +++ b/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java @@ -11,7 +11,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/elasticsearch/plugins/PluginRuntimeInfo.java b/server/src/main/java/org/elasticsearch/plugins/PluginRuntimeInfo.java index 132a7516b9603..f58f14bcd7a77 100644 --- a/server/src/main/java/org/elasticsearch/plugins/PluginRuntimeInfo.java +++ b/server/src/main/java/org/elasticsearch/plugins/PluginRuntimeInfo.java @@ -9,7 +9,6 @@ package org.elasticsearch.plugins; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptContextStats.java b/server/src/main/java/org/elasticsearch/script/ScriptContextStats.java index c029158697c8b..6e5eba4834ac4 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptContextStats.java +++ b/server/src/main/java/org/elasticsearch/script/ScriptContextStats.java @@ -9,7 +9,6 @@ package org.elasticsearch.script; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptException.java b/server/src/main/java/org/elasticsearch/script/ScriptException.java index 335cc2cddc0e8..b066ddb24d1ee 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptException.java +++ b/server/src/main/java/org/elasticsearch/script/ScriptException.java @@ -10,7 +10,6 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptStats.java b/server/src/main/java/org/elasticsearch/script/ScriptStats.java index 37ab3cdd5f3b2..76f512d627817 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptStats.java +++ b/server/src/main/java/org/elasticsearch/script/ScriptStats.java @@ -9,7 +9,6 @@ package org.elasticsearch.script; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/elasticsearch/script/TimeSeries.java b/server/src/main/java/org/elasticsearch/script/TimeSeries.java index b93e53a8f2720..0311d3322e456 100644 --- a/server/src/main/java/org/elasticsearch/script/TimeSeries.java +++ b/server/src/main/java/org/elasticsearch/script/TimeSeries.java @@ -9,7 +9,6 @@ package org.elasticsearch.script; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/elasticsearch/tasks/TaskCancellationService.java b/server/src/main/java/org/elasticsearch/tasks/TaskCancellationService.java index 49c1e55d64b74..122a25a613917 100644 --- a/server/src/main/java/org/elasticsearch/tasks/TaskCancellationService.java +++ b/server/src/main/java/org/elasticsearch/tasks/TaskCancellationService.java @@ -13,7 +13,6 @@ import org.elasticsearch.ElasticsearchSecurityException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ResultDeduplicator; import org.elasticsearch.action.StepListener; diff --git a/server/src/main/java/org/elasticsearch/transport/ActionTransportException.java b/server/src/main/java/org/elasticsearch/transport/ActionTransportException.java index 272a71d4d3daf..444a34e4bcc3e 100644 --- a/server/src/main/java/org/elasticsearch/transport/ActionTransportException.java +++ b/server/src/main/java/org/elasticsearch/transport/ActionTransportException.java @@ -9,7 +9,6 @@ package org.elasticsearch.transport; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.network.NetworkAddress; diff --git a/server/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java b/server/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java index aef336ea38397..51aca540f7aa6 100644 --- a/server/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java +++ b/server/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java @@ -9,7 +9,6 @@ package org.elasticsearch.transport; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.ReleasableBytesReference; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/elasticsearch/transport/ConnectTransportException.java b/server/src/main/java/org/elasticsearch/transport/ConnectTransportException.java index 1469d14c29d71..e6e566e26b03b 100644 --- a/server/src/main/java/org/elasticsearch/transport/ConnectTransportException.java +++ b/server/src/main/java/org/elasticsearch/transport/ConnectTransportException.java @@ -9,7 +9,6 @@ package org.elasticsearch.transport; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java b/server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java index 62c237cc2be23..b21455829fb05 100644 --- a/server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java +++ b/server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java @@ -9,7 +9,6 @@ package org.elasticsearch.transport; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; diff --git a/server/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java b/server/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java index 5d87e3b7a4961..5b3fe6e904f13 100644 --- a/server/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java +++ b/server/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java @@ -8,7 +8,7 @@ package org.elasticsearch.action; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; @@ -16,7 +16,7 @@ import java.io.IOException; -import static org.elasticsearch.test.VersionUtils.randomCompatibleVersion; +import static org.elasticsearch.test.TransportVersionUtils.randomCompatibleVersion; import static org.hamcrest.CoreMatchers.equalTo; public class OriginalIndicesTests extends ESTestCase { @@ -34,18 +34,18 @@ public void testOriginalIndicesSerialization() throws IOException { OriginalIndices originalIndices = randomOriginalIndices(); BytesStreamOutput out = new BytesStreamOutput(); - out.setVersion(randomCompatibleVersion(random(), Version.CURRENT)); + out.setTransportVersion(randomCompatibleVersion(random(), TransportVersion.CURRENT)); OriginalIndices.writeOriginalIndices(originalIndices, out); StreamInput in = out.bytes().streamInput(); - in.setVersion(out.getVersion()); + in.setTransportVersion(out.getTransportVersion()); OriginalIndices originalIndices2 = OriginalIndices.readOriginalIndices(in); assertThat(originalIndices2.indices(), equalTo(originalIndices.indices())); // indices options are not equivalent when sent to an older version and re-read due // to the addition of hidden indices as expand to hidden indices is always true when // read from a prior version - if (out.getVersion().onOrAfter(Version.V_7_7_0) || originalIndices.indicesOptions().expandWildcardsHidden()) { + if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_7_0) || originalIndices.indicesOptions().expandWildcardsHidden()) { assertThat(originalIndices2.indicesOptions(), equalTo(originalIndices.indicesOptions())); } else if (originalIndices.indicesOptions().expandWildcardsHidden()) { assertThat(originalIndices2.indicesOptions(), equalTo(originalIndices.indicesOptions())); diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestTests.java index e5ecc8722146c..cf7bda6fc4c0b 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestTests.java @@ -14,7 +14,7 @@ import java.io.IOException; -import static org.elasticsearch.test.VersionUtils.randomVersion; +import static org.elasticsearch.test.TransportVersionUtils.randomVersion; import static org.hamcrest.CoreMatchers.equalTo; public class GetStoredScriptRequestTests extends ESTestCase { @@ -22,11 +22,11 @@ public void testGetIndexedScriptRequestSerialization() throws IOException { GetStoredScriptRequest request = new GetStoredScriptRequest("id"); BytesStreamOutput out = new BytesStreamOutput(); - out.setVersion(randomVersion(random())); + out.setTransportVersion(randomVersion(random())); request.writeTo(out); StreamInput in = out.bytes().streamInput(); - in.setVersion(out.getVersion()); + in.setTransportVersion(out.getTransportVersion()); GetStoredScriptRequest request2 = new GetStoredScriptRequest(in); assertThat(request2.id(), equalTo(request.id())); diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/resolve/TransportResolveIndexActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/resolve/TransportResolveIndexActionTests.java index 9b751702dfd6c..b6426d4dc107b 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/resolve/TransportResolveIndexActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/indices/resolve/TransportResolveIndexActionTests.java @@ -8,6 +8,7 @@ package org.elasticsearch.action.admin.indices.resolve; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilter; @@ -54,8 +55,10 @@ public void testCCSCompatibilityCheck() throws Exception { @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getVersion().before(Version.CURRENT)) { - throw new IllegalArgumentException("This request isn't serializable to nodes before " + Version.CURRENT); + if (out.getTransportVersion().before(TransportVersion.CURRENT)) { + throw new IllegalArgumentException( + "This request isn't serializable before transport version " + TransportVersion.CURRENT + ); } } }; diff --git a/server/src/test/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesActionTests.java b/server/src/test/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesActionTests.java index 1e5f9762b1b5e..88494de24450c 100644 --- a/server/src/test/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesActionTests.java @@ -8,6 +8,7 @@ package org.elasticsearch.action.fieldcaps; +import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilter; @@ -56,8 +57,10 @@ public void testCCSCompatibilityCheck() throws Exception { fieldCapsRequest.indexFilter(new DummyQueryBuilder() { @Override protected void doWriteTo(StreamOutput out) throws IOException { - if (out.getVersion().before(Version.CURRENT)) { - throw new IllegalArgumentException("This query isn't serializable to nodes before " + Version.CURRENT); + if (out.getTransportVersion().before(TransportVersion.CURRENT)) { + throw new IllegalArgumentException( + "This query isn't serializable before transport version " + TransportVersion.CURRENT + ); } } }); diff --git a/server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java b/server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java index 2546e4ef2a0ec..879e4c73dd3cb 100644 --- a/server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java +++ b/server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java @@ -8,7 +8,7 @@ package org.elasticsearch.action.get; -import org.elasticsearch.Version; +import org.elasticsearch.TransportVersion; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -18,7 +18,7 @@ import java.io.IOException; -import static org.elasticsearch.test.VersionUtils.randomVersionBetween; +import static org.elasticsearch.test.TransportVersionUtils.randomVersionBetween; import static org.hamcrest.CoreMatchers.equalTo; public class MultiGetShardRequestTests extends ESTestCase { @@ -26,15 +26,15 @@ public void testSerialization() throws IOException { MultiGetShardRequest multiGetShardRequest = createTestInstance(randomBoolean()); BytesStreamOutput out = new BytesStreamOutput(); - Version minVersion = Version.CURRENT.minimumCompatibilityVersion(); + TransportVersion minVersion = TransportVersion.CURRENT.minimumCompatibilityVersion(); if (multiGetShardRequest.isForceSyntheticSource()) { - minVersion = Version.V_8_4_0; + minVersion = TransportVersion.V_8_4_0; } - out.setVersion(randomVersionBetween(random(), minVersion, Version.CURRENT)); + out.setTransportVersion(randomVersionBetween(random(), minVersion, TransportVersion.CURRENT)); multiGetShardRequest.writeTo(out); StreamInput in = out.bytes().streamInput(); - in.setVersion(out.getVersion()); + in.setTransportVersion(out.getTransportVersion()); MultiGetShardRequest multiGetShardRequest2 = new MultiGetShardRequest(in); assertThat(multiGetShardRequest2.index(), equalTo(multiGetShardRequest.index())); assertThat(multiGetShardRequest2.preference(), equalTo(multiGetShardRequest.preference())); @@ -58,7 +58,7 @@ public void testSerialization() throws IOException { public void testForceSyntheticUnsupported() { MultiGetShardRequest request = createTestInstance(true); StreamOutput out = new BytesStreamOutput(); - out.setVersion(Version.V_8_3_0); + out.setTransportVersion(TransportVersion.V_8_3_0); Exception e = expectThrows(IllegalArgumentException.class, () -> request.writeTo(out)); assertEquals(e.getMessage(), "force_synthetic_source is not supported before 8.4.0"); } diff --git a/server/src/test/java/org/elasticsearch/common/io/stream/DelayableWriteableTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/DelayableWriteableTests.java index be1888d189fa2..078a09bf44fe1 100644 --- a/server/src/test/java/org/elasticsearch/common/io/stream/DelayableWriteableTests.java +++ b/server/src/test/java/org/elasticsearch/common/io/stream/DelayableWriteableTests.java @@ -9,10 +9,8 @@ package org.elasticsearch.common.io.stream; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.TransportVersionUtils; -import org.elasticsearch.test.VersionUtils; import java.io.IOException; @@ -195,6 +193,9 @@ protected NamedWriteableRegistry writableRegistry() { } private static TransportVersion randomOldVersion() { - return randomValueOtherThanMany(TransportVersion.CURRENT::before, () -> TransportVersionUtils.randomCompatibleVersion(random(), TransportVersion.CURRENT)); + return randomValueOtherThanMany( + TransportVersion.CURRENT::before, + () -> TransportVersionUtils.randomCompatibleVersion(random(), TransportVersion.CURRENT) + ); } } diff --git a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java index 0ffe21cd76c78..244a66338ce94 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java @@ -11,7 +11,6 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.action.bulk.BulkItemResponse.Failure; import org.elasticsearch.client.internal.transport.NoNodeAvailableException; import org.elasticsearch.common.io.stream.BytesStreamOutput; diff --git a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java index 6ccf8d95ec66a..1d2ec8ae082e8 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java @@ -11,7 +11,6 @@ import org.apache.lucene.tests.util.LuceneTestCase; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.Randomness; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.BytesStreamOutput; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/GetFeatureUsageResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/GetFeatureUsageResponse.java index dfc6a7ae8ad73..91380980a58a7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/GetFeatureUsageResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/GetFeatureUsageResponse.java @@ -8,7 +8,6 @@ package org.elasticsearch.license; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java index 2d6f789eca18d..820181c5c3218 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java @@ -7,7 +7,6 @@ package org.elasticsearch.protocol.xpack; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/GraphExploreRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/GraphExploreRequest.java index ddad443515541..94604dbd8227c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/GraphExploreRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/GraphExploreRequest.java @@ -7,7 +7,6 @@ package org.elasticsearch.protocol.xpack.graph; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleExplainResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleExplainResponse.java index b2ed0c267230d..879db231a99e3 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleExplainResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleExplainResponse.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ilm; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleFeatureSetUsage.java index 2ef08a4a62d71..59b614fc805be 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleFeatureSetUsage.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ilm; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/RolloverAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/RolloverAction.java index 22bf525a83a6c..960f2ae58153a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/RolloverAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/RolloverAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ilm; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.client.internal.Client; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/IndexerJobStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/IndexerJobStats.java index ea0170ed5e8a6..1bdc35962f7fe 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/IndexerJobStats.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/IndexerJobStats.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.indexing; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java index b4e3d549c6981..b36a6a447b6b2 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.transform.transforms.pivot; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.common.Rounding; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/BlobAnalyzeAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/BlobAnalyzeAction.java index 256984eaf751b..65acc3b7e2f14 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/BlobAnalyzeAction.java +++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/BlobAnalyzeAction.java @@ -10,7 +10,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListenerResponseHandler; import org.elasticsearch.action.ActionRequest; diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/RepositoryAnalyzeAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/RepositoryAnalyzeAction.java index afd045da69960..ec79367f2b57c 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/RepositoryAnalyzeAction.java +++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/RepositoryAnalyzeAction.java @@ -11,7 +11,6 @@ import org.apache.logging.log4j.Logger; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.TransportVersion; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListenerResponseHandler; import org.elasticsearch.action.ActionRequest; @@ -704,7 +703,9 @@ public void writeTo(StreamOutput out) throws IOException { if (out.getTransportVersion().onOrAfter(TransportVersion.V_7_14_0)) { out.writeBoolean(abortWritePermitted); } else if (abortWritePermitted) { - throw new IllegalStateException("cannot send abortWritePermitted request on transport version [" + out.getTransportVersion() + "]"); + throw new IllegalStateException( + "cannot send abortWritePermitted request on transport version [" + out.getTransportVersion() + "]" + ); } } From 827fa3935335bcca497d644a021bfe2344d4d82c Mon Sep 17 00:00:00 2001 From: Simon Cooper Date: Thu, 26 Jan 2023 14:48:57 +0000 Subject: [PATCH 3/5] Fix compile --- .../PublicationTransportHandler.java | 18 +++++++++--------- .../plugins/PluginDescriptor.java | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java b/server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java index 77bd76b27d95f..4d6b4ce1edd07 100644 --- a/server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java +++ b/server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java @@ -227,7 +227,7 @@ public PublicationContext newPublicationContext(ClusterStatePublicationEvent clu } private ReleasableBytesReference serializeFullClusterState(ClusterState clusterState, DiscoveryNode node) { - final Version nodeVersion = node.getVersion(); + final TransportVersion serializeVersion = node.getVersion().transportVersion; final RecyclerBytesStreamOutput bytesStream = transportService.newNetworkBytesStream(); boolean success = false; try { @@ -237,7 +237,7 @@ private ReleasableBytesReference serializeFullClusterState(ClusterState clusterS CompressorFactory.COMPRESSOR.threadLocalOutputStream(Streams.flushOnCloseStream(bytesStream)) ) ) { - stream.setTransportVersion(nodeVersion); + stream.setTransportVersion(serializeVersion); stream.writeBoolean(true); clusterState.writeTo(stream); uncompressedBytes = stream.position(); @@ -247,9 +247,9 @@ private ReleasableBytesReference serializeFullClusterState(ClusterState clusterS final ReleasableBytesReference result = new ReleasableBytesReference(bytesStream.bytes(), bytesStream); serializationStatsTracker.serializedFullState(uncompressedBytes, result.length()); logger.trace( - "serialized full cluster state version [{}] for node version [{}] with size [{}]", + "serialized full cluster state version [{}] using transport version [{}] with size [{}]", clusterState.version(), - nodeVersion, + serializeVersion, result.length() ); success = true; @@ -263,7 +263,7 @@ private ReleasableBytesReference serializeFullClusterState(ClusterState clusterS private ReleasableBytesReference serializeDiffClusterState(ClusterState newState, Diff diff, DiscoveryNode node) { final long clusterStateVersion = newState.version(); - final Version nodeVersion = node.getVersion(); + final TransportVersion serializeVersion = node.getVersion().transportVersion; final RecyclerBytesStreamOutput bytesStream = transportService.newNetworkBytesStream(); boolean success = false; try { @@ -273,10 +273,10 @@ private ReleasableBytesReference serializeDiffClusterState(ClusterState newState CompressorFactory.COMPRESSOR.threadLocalOutputStream(Streams.flushOnCloseStream(bytesStream)) ) ) { - stream.setVersion(nodeVersion); + stream.setTransportVersion(serializeVersion); stream.writeBoolean(false); diff.writeTo(stream); - if (nodeVersion.onOrAfter(INCLUDES_LAST_COMMITTED_DATA_VERSION)) { + if (serializeVersion.onOrAfter(INCLUDES_LAST_COMMITTED_DATA_VERSION)) { stream.writeBoolean(newState.metadata().clusterUUIDCommitted()); newState.getLastCommittedConfiguration().writeTo(stream); } @@ -287,9 +287,9 @@ private ReleasableBytesReference serializeDiffClusterState(ClusterState newState final ReleasableBytesReference result = new ReleasableBytesReference(bytesStream.bytes(), bytesStream); serializationStatsTracker.serializedDiff(uncompressedBytes, result.length()); logger.trace( - "serialized cluster state diff for version [{}] for node version [{}] with size [{}]", + "serialized cluster state diff for version [{}] using transport version [{}] with size [{}]", clusterStateVersion, - nodeVersion, + serializeVersion, result.length() ); success = true; diff --git a/server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java b/server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java index 47624fbe42c9d..dd56e18957318 100644 --- a/server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java +++ b/server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java @@ -137,7 +137,7 @@ public PluginDescriptor(final StreamInput in) throws IOException { isLicensed = false; } - if (in.getTransportVersion().onOrAfter(Version.V_8_4_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_4_0)) { isModular = in.readBoolean(); isStable = in.readBoolean(); } else { From d4a62a0a74e22a2c8720ca03eda11dc40160f954 Mon Sep 17 00:00:00 2001 From: Simon Cooper Date: Thu, 26 Jan 2023 15:26:38 +0000 Subject: [PATCH 4/5] Fix tests --- .../indices/resolve/TransportResolveIndexActionTests.java | 5 ++++- .../fieldcaps/TransportFieldCapabilitiesActionTests.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/resolve/TransportResolveIndexActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/resolve/TransportResolveIndexActionTests.java index b6426d4dc107b..cf3fd1efb37f8 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/resolve/TransportResolveIndexActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/indices/resolve/TransportResolveIndexActionTests.java @@ -84,7 +84,10 @@ public void writeTo(StreamOutput out) throws IOException { assertThat(ex.getMessage(), containsString("not compatible with version")); assertThat(ex.getMessage(), containsString("and the 'search.check_ccs_compatibility' setting is enabled.")); - assertEquals("This request isn't serializable to nodes before " + Version.CURRENT, ex.getCause().getMessage()); + assertEquals( + "This request isn't serializable before transport version " + TransportVersion.CURRENT, + ex.getCause().getMessage() + ); } finally { assertTrue(ESTestCase.terminate(threadPool)); } diff --git a/server/src/test/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesActionTests.java b/server/src/test/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesActionTests.java index 88494de24450c..a390924b2e20b 100644 --- a/server/src/test/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesActionTests.java @@ -91,7 +91,7 @@ protected void doWriteTo(StreamOutput out) throws IOException { containsString("[class org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequest] is not compatible with version") ); assertThat(ex.getMessage(), containsString("and the 'search.check_ccs_compatibility' setting is enabled.")); - assertEquals("This query isn't serializable to nodes before " + Version.CURRENT, ex.getCause().getMessage()); + assertEquals("This query isn't serializable before transport version " + TransportVersion.CURRENT, ex.getCause().getMessage()); } finally { assertTrue(ESTestCase.terminate(threadPool)); } From b61891b7317004672d4213fb94f8c2c81fdf9a02 Mon Sep 17 00:00:00 2001 From: Simon Cooper Date: Thu, 26 Jan 2023 16:54:38 +0000 Subject: [PATCH 5/5] Missed one --- .../cluster/coordination/PublicationTransportHandlerTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTransportHandlerTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTransportHandlerTests.java index ccd34e74c610f..a4b6b1f7fe871 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTransportHandlerTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTransportHandlerTests.java @@ -137,7 +137,7 @@ private static boolean isDiff(BytesTransportRequest request, DiscoveryNode node) if (compressor != null) { in = new InputStreamStreamInput(compressor.threadLocalInputStream(in)); } - in.setVersion(node.getVersion()); + in.setTransportVersion(node.getVersion().transportVersion); return in.readBoolean() == false; } finally { IOUtils.close(in);