diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java index dcdcc3c640fb9..0055bdec96441 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersions.java +++ b/server/src/main/java/org/elasticsearch/TransportVersions.java @@ -75,7 +75,6 @@ static TransportVersion def(int id) { public static final TransportVersion V_8_13_4 = def(8_595_0_01); public static final TransportVersion V_8_14_0 = def(8_636_0_01); public static final TransportVersion V_8_15_0 = def(8_702_0_02); - public static final TransportVersion V_8_15_2 = def(8_702_0_03); public static final TransportVersion V_8_16_0 = def(8_772_0_01); // TODO: leave this version until the very end to satisfy max transport version test public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_5 = def(8_797_0_05); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java index e46762c9e97ab..df002a338c198 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java @@ -177,21 +177,13 @@ public Response(Map nodeAllocationStats, DiskThresh public Response(StreamInput in) throws IOException { this.nodeAllocationStats = in.readImmutableMap(StreamInput::readString, NodeAllocationStats::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.diskThresholdSettings = in.readOptionalWriteable(DiskThresholdSettings::readFrom); - } else { - this.diskThresholdSettings = null; - } + this.diskThresholdSettings = in.readOptionalWriteable(DiskThresholdSettings::readFrom); } @Override public void writeTo(StreamOutput out) throws IOException { out.writeMap(nodeAllocationStats, StreamOutput::writeString, StreamOutput::writeWriteable); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeOptionalWriteable(diskThresholdSettings); - } else { - assert diskThresholdSettings == null; - } + out.writeOptionalWriteable(diskThresholdSettings); } public Map getNodeAllocationStats() { diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java index 66c985d98b01a..13566615e78e5 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.admin.cluster.node.stats; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.FailedNodeException; @@ -186,9 +185,6 @@ public static class NodeStatsRequest extends AbstractTransportRequest { public NodeStatsRequest(StreamInput in) throws IOException { super(in); this.nodesStatsRequestParameters = new NodesStatsRequestParameters(in); - if (in.getTransportVersion().between(TransportVersions.V_8_13_0, TransportVersions.V_8_15_0)) { - in.readStringArray(); // formerly nodeIds, now unused - } } NodeStatsRequest(NodesStatsRequest request) { @@ -213,9 +209,6 @@ public String getDescription() { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); nodesStatsRequestParameters.writeTo(out); - if (out.getTransportVersion().between(TransportVersions.V_8_13_0, TransportVersions.V_8_15_0)) { - out.writeStringArray(Strings.EMPTY_ARRAY); // formerly nodeIds, now unused - } } public NodesStatsRequestParameters getNodesStatsRequestParameters() { diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/CleanupRepositoryRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/CleanupRepositoryRequest.java index cdcf4bdad7b1a..55fa3d089f73d 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/CleanupRepositoryRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/CleanupRepositoryRequest.java @@ -8,7 +8,6 @@ */ package org.elasticsearch.action.admin.cluster.repositories.cleanup; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.AcknowledgedRequest; import org.elasticsearch.common.io.stream.StreamInput; @@ -29,11 +28,7 @@ public CleanupRepositoryRequest(TimeValue masterNodeTimeout, TimeValue ackTimeou } public static CleanupRepositoryRequest readFrom(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - return new CleanupRepositoryRequest(in); - } else { - return new CleanupRepositoryRequest(TimeValue.THIRTY_SECONDS, TimeValue.THIRTY_SECONDS, in); - } + return new CleanupRepositoryRequest(in); } private CleanupRepositoryRequest(StreamInput in) throws IOException { @@ -48,9 +43,7 @@ public CleanupRepositoryRequest(TimeValue masterNodeTimeout, TimeValue ackTimeou @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - super.writeTo(out); - } + super.writeTo(out); out.writeString(repository); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java index ab073f83e14da..916dbb57a2a29 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.admin.cluster.snapshots.delete; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.common.Strings; @@ -51,9 +50,7 @@ public DeleteSnapshotRequest(StreamInput in) throws IOException { super(in); repository = in.readString(); snapshots = in.readStringArray(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - waitForCompletion = in.readBoolean(); - } + waitForCompletion = in.readBoolean(); } @Override @@ -61,11 +58,7 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeString(repository); out.writeStringArray(snapshots); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeBoolean(waitForCompletion); - } else { - assert waitForCompletion : "Using wait_for_completion parameter when it should have been disallowed"; - } + out.writeBoolean(waitForCompletion); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java index 9fffdac13fae4..11fd2d671f783 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.admin.cluster.snapshots.delete; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.ActionFilters; @@ -65,9 +64,6 @@ protected ClusterBlockException checkBlock(DeleteSnapshotRequest request, Cluste @Override protected void doExecute(Task task, DeleteSnapshotRequest request, ActionListener listener) { - if (clusterService.state().getMinTransportVersion().before(TransportVersions.V_8_15_0) && request.waitForCompletion() == false) { - throw new UnsupportedOperationException("wait_for_completion parameter is not supported by all nodes in this cluster"); - } super.doExecute(task, request, listener); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java index 813a42b9d6730..d0af39e6c8461 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java @@ -99,11 +99,7 @@ public CreateIndexRequest(StreamInput in) throws IOException { } else { requireDataStream = false; } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - initializeFailureStore = in.readBoolean(); - } else { - initializeFailureStore = true; - } + initializeFailureStore = in.readBoolean(); } public CreateIndexRequest() { @@ -505,9 +501,7 @@ public void writeTo(StreamOutput out) throws IOException { if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { out.writeBoolean(this.requireDataStream); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeBoolean(this.initializeFailureStore); - } + out.writeBoolean(this.initializeFailureStore); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java index de9692cdaaded..b97d3bfb3f257 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.admin.indices.segments; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.support.broadcast.BroadcastRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -31,9 +30,7 @@ public IndicesSegmentsRequest() { public IndicesSegmentsRequest(StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.includeVectorFormatsInfo = in.readBoolean(); - } + this.includeVectorFormatsInfo = in.readBoolean(); } public IndicesSegmentsRequest(String... indices) { @@ -53,9 +50,7 @@ public boolean isIncludeVectorFormatsInfo() { @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeBoolean(includeVectorFormatsInfo); - } + out.writeBoolean(includeVectorFormatsInfo); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java index 545684cd01ad7..eb41a63268ffc 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java @@ -50,7 +50,6 @@ public class CommonStats implements Writeable, ToXContentFragment { private static final TransportVersion VERSION_SUPPORTING_DENSE_VECTOR_STATS = TransportVersions.V_8_10_X; - private static final TransportVersion VERSION_SUPPORTING_SPARSE_VECTOR_STATS = TransportVersions.V_8_15_0; @Nullable public DocsStats docs; @@ -222,9 +221,7 @@ public CommonStats(StreamInput in) throws IOException { if (in.getTransportVersion().onOrAfter(VERSION_SUPPORTING_DENSE_VECTOR_STATS)) { denseVectorStats = in.readOptionalWriteable(DenseVectorStats::new); } - if (in.getTransportVersion().onOrAfter(VERSION_SUPPORTING_SPARSE_VECTOR_STATS)) { - sparseVectorStats = in.readOptionalWriteable(SparseVectorStats::new); - } + sparseVectorStats = in.readOptionalWriteable(SparseVectorStats::new); } @Override @@ -251,9 +248,7 @@ public void writeTo(StreamOutput out) throws IOException { if (out.getTransportVersion().onOrAfter(VERSION_SUPPORTING_DENSE_VECTOR_STATS)) { out.writeOptionalWriteable(denseVectorStats); } - if (out.getTransportVersion().onOrAfter(VERSION_SUPPORTING_SPARSE_VECTOR_STATS)) { - out.writeOptionalWriteable(sparseVectorStats); - } + out.writeOptionalWriteable(sparseVectorStats); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java index 1ab570d7ffed6..25fe73276e3b9 100644 --- a/server/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java +++ b/server/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java @@ -11,7 +11,6 @@ import org.apache.lucene.util.Accountable; import org.apache.lucene.util.RamUsageEstimator; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.DocWriteRequest; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.support.replication.ReplicatedWriteRequest; @@ -44,11 +43,7 @@ public final class BulkShardRequest extends ReplicatedWriteRequest i.readOptionalWriteable(inpt -> new BulkItemRequest(shardId, inpt)), BulkItemRequest[]::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - isSimulated = in.readBoolean(); - } else { - isSimulated = false; - } + isSimulated = in.readBoolean(); } public BulkShardRequest( @@ -166,9 +161,7 @@ public void writeTo(StreamOutput out) throws IOException { } super.writeTo(out); out.writeArray((o, item) -> o.writeOptional(BulkItemRequest.THIN_WRITER, item), items); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeBoolean(isSimulated); - } + out.writeBoolean(isSimulated); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/ExplainIndexDataStreamLifecycle.java b/server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/ExplainIndexDataStreamLifecycle.java index f9bd135968246..b4a1ec36365dd 100644 --- a/server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/ExplainIndexDataStreamLifecycle.java +++ b/server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/ExplainIndexDataStreamLifecycle.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.datastreams.lifecycle; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.admin.indices.rollover.RolloverConfiguration; import org.elasticsearch.cluster.metadata.DataStreamGlobalRetention; import org.elasticsearch.cluster.metadata.DataStreamLifecycle; @@ -82,11 +81,7 @@ public ExplainIndexDataStreamLifecycle( public ExplainIndexDataStreamLifecycle(StreamInput in) throws IOException { this.index = in.readString(); this.managedByLifecycle = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.isInternalDataStream = in.readBoolean(); - } else { - this.isInternalDataStream = false; - } + this.isInternalDataStream = in.readBoolean(); if (managedByLifecycle) { this.indexCreationDate = in.readOptionalLong(); this.rolloverDate = in.readOptionalLong(); @@ -165,9 +160,7 @@ public XContentBuilder toXContent( public void writeTo(StreamOutput out) throws IOException { out.writeString(index); out.writeBoolean(managedByLifecycle); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeBoolean(isInternalDataStream); - } + out.writeBoolean(isInternalDataStream); if (managedByLifecycle) { out.writeOptionalLong(indexCreationDate); out.writeOptionalLong(rolloverDate); diff --git a/server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/GetDataStreamLifecycleAction.java b/server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/GetDataStreamLifecycleAction.java index 5dac1d632e3de..e2a852a18a1a5 100644 --- a/server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/GetDataStreamLifecycleAction.java +++ b/server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/GetDataStreamLifecycleAction.java @@ -185,9 +185,7 @@ public record DataStreamLifecycle( public void writeTo(StreamOutput out) throws IOException { out.writeString(dataStreamName); out.writeOptionalWriteable(lifecycle); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeBoolean(isInternalDataStream); - } + out.writeBoolean(isInternalDataStream); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/ingest/SimulateIndexResponse.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulateIndexResponse.java index 70a40aab0ac6a..7a160ea5f60a3 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/SimulateIndexResponse.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/SimulateIndexResponse.java @@ -11,7 +11,6 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.bulk.IndexDocFailureStoreStatus; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.common.bytes.BytesReference; @@ -53,11 +52,7 @@ public SimulateIndexResponse(StreamInput in) throws IOException { this.source = in.readBytesReference(); this.sourceXContentType = XContentType.valueOf(in.readString()); setShardInfo(ShardInfo.EMPTY); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.exception = in.readException(); - } else { - this.exception = null; - } + this.exception = in.readException(); this.ignoredFields = in.readStringCollectionAsList(); if (in.getTransportVersion().supports(SIMULATE_INGEST_EFFECTIVE_MAPPING)) { if (in.readBoolean()) { @@ -145,9 +140,7 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeBytesReference(source); out.writeString(sourceXContentType.name()); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeException(exception); - } + out.writeException(exception); out.writeStringCollection(ignoredFields); if (out.getTransportVersion().supports(SIMULATE_INGEST_EFFECTIVE_MAPPING)) { out.writeBoolean(effectiveMapping != null); diff --git a/server/src/main/java/org/elasticsearch/action/support/local/LocalClusterStateRequest.java b/server/src/main/java/org/elasticsearch/action/support/local/LocalClusterStateRequest.java index eb46471ad06e0..fdce179a9e723 100644 --- a/server/src/main/java/org/elasticsearch/action/support/local/LocalClusterStateRequest.java +++ b/server/src/main/java/org/elasticsearch/action/support/local/LocalClusterStateRequest.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.support.local; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.TransportAction; @@ -55,9 +54,7 @@ protected LocalClusterStateRequest(StreamInput in) throws IOException { protected LocalClusterStateRequest(StreamInput in, boolean readLocal) throws IOException { super(in); masterTimeout = in.readTimeValue(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - in.readVLong(); - } + in.readVLong(); if (readLocal) { in.readBoolean(); } diff --git a/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java index 2f0bf8870830b..a72eec388514b 100644 --- a/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java +++ b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.support.master; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -79,11 +78,7 @@ protected MasterNodeRequest(TimeValue masterNodeTimeout) { protected MasterNodeRequest(StreamInput in) throws IOException { super(in); masterNodeTimeout = in.readTimeValue(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - masterTerm = in.readVLong(); - } else { - masterTerm = 0L; - } + masterTerm = in.readVLong(); } @Override @@ -93,9 +88,7 @@ public void writeTo(StreamOutput out) throws IOException { assert masterTerm <= newMasterTerm : masterTerm + " vs " + newMasterTerm; super.writeTo(out); out.writeTimeValue(masterNodeTimeout); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeVLong(newMasterTerm); - } // else no protection against routing loops in older versions + out.writeVLong(newMasterTerm); } private long getNewMasterTerm(StreamOutput out) { diff --git a/server/src/main/java/org/elasticsearch/cluster/ClusterState.java b/server/src/main/java/org/elasticsearch/cluster/ClusterState.java index b03cca116ef18..8b838f409f023 100644 --- a/server/src/main/java/org/elasticsearch/cluster/ClusterState.java +++ b/server/src/main/java/org/elasticsearch/cluster/ClusterState.java @@ -10,7 +10,6 @@ package org.elasticsearch.cluster; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.Version; import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.block.ClusterBlock; @@ -55,7 +54,6 @@ import org.elasticsearch.core.Nullable; import org.elasticsearch.core.SuppressForbidden; import org.elasticsearch.core.Tuple; -import org.elasticsearch.index.shard.IndexLongFieldRange; import org.elasticsearch.indices.SystemIndexDescriptor; import org.elasticsearch.xcontent.ToXContent; import org.elasticsearch.xcontent.XContent; @@ -245,27 +243,6 @@ public ClusterState( this.minVersions = blocks.hasGlobalBlock(STATE_NOT_RECOVERED_BLOCK) ? new CompatibilityVersions(TransportVersion.minimumCompatible(), Map.of()) // empty map because cluster state is unknown : CompatibilityVersions.minimumVersions(compatibilityVersions.values()); - - assert compatibilityVersions.isEmpty() - || blocks.hasGlobalBlock(STATE_NOT_RECOVERED_BLOCK) - || assertEventIngestedIsUnknownInMixedClusters(metadata, this.minVersions); - } - - private boolean assertEventIngestedIsUnknownInMixedClusters(Metadata metadata, CompatibilityVersions compatibilityVersions) { - if (compatibilityVersions.transportVersion().before(TransportVersions.V_8_15_0) - && metadata != null - && metadata.getTotalNumberOfIndices() > 0) { - for (IndexMetadata indexMetadata : metadata.indicesAllProjects()) { - assert indexMetadata.getEventIngestedRange() == IndexLongFieldRange.UNKNOWN - : "event.ingested range should be UNKNOWN but is " - + indexMetadata.getEventIngestedRange() - + " for index: " - + indexMetadata.getIndex() - + " minTransportVersion: " - + compatibilityVersions.transportVersion(); - } - } - return true; } private static boolean assertConsistentRoutingNodes( diff --git a/server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java b/server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java index f24d5be356ee5..376e0aad3afa7 100644 --- a/server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java +++ b/server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java @@ -14,7 +14,6 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ResultDeduplicator; @@ -743,13 +742,11 @@ public ClusterState execute(BatchExecutionContext batchE */ IndexLongFieldRange newEventIngestedMillisRange = IndexLongFieldRange.UNKNOWN; TransportVersion minTransportVersion = batchExecutionContext.initialState().getMinTransportVersion(); - if (minTransportVersion.onOrAfter(TransportVersions.V_8_15_0)) { - newEventIngestedMillisRange = currentEventIngestedMillisRange.extendWithShardRange( - startedShardEntry.shardId.id(), - indexMetadata.getNumberOfShards(), - startedShardEntry.eventIngestedRange - ); - } + newEventIngestedMillisRange = currentEventIngestedMillisRange.extendWithShardRange( + startedShardEntry.shardId.id(), + indexMetadata.getNumberOfShards(), + startedShardEntry.eventIngestedRange + ); if (newTimestampMillisRange != currentTimestampMillisRange || newEventIngestedMillisRange != currentEventIngestedMillisRange) { @@ -853,11 +850,7 @@ public static class StartedShardEntry extends AbstractTransportRequest { primaryTerm = in.readVLong(); this.message = in.readString(); this.timestampRange = ShardLongFieldRange.readFrom(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.eventIngestedRange = ShardLongFieldRange.readFrom(in); - } else { - this.eventIngestedRange = ShardLongFieldRange.UNKNOWN; - } + this.eventIngestedRange = ShardLongFieldRange.readFrom(in); } public StartedShardEntry( @@ -884,9 +877,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVLong(primaryTerm); out.writeString(message); timestampRange.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - eventIngestedRange.writeTo(out); - } + eventIngestedRange.writeTo(out); } @Override diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/JoinStatus.java b/server/src/main/java/org/elasticsearch/cluster/coordination/JoinStatus.java index 89083848d488d..0bbfdda6a36ab 100644 --- a/server/src/main/java/org/elasticsearch/cluster/coordination/JoinStatus.java +++ b/server/src/main/java/org/elasticsearch/cluster/coordination/JoinStatus.java @@ -9,7 +9,6 @@ package org.elasticsearch.cluster.coordination; -import org.elasticsearch.TransportVersions; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -17,18 +16,10 @@ import org.elasticsearch.core.TimeValue; import java.io.IOException; -import java.util.concurrent.TimeUnit; public record JoinStatus(DiscoveryNode remoteNode, long term, String message, TimeValue age) implements Writeable { public JoinStatus(StreamInput in) throws IOException { - this( - new DiscoveryNode(in), - in.readLong(), - in.readString(), - in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0) - ? in.readTimeValue() - : new TimeValue(in.readLong(), TimeUnit.valueOf(in.readString())) - ); + this(new DiscoveryNode(in), in.readLong(), in.readString(), in.readTimeValue()); } @Override @@ -36,11 +27,6 @@ public void writeTo(StreamOutput out) throws IOException { remoteNode.writeTo(out); out.writeLong(term); out.writeString(message); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeTimeValue(age); - } else { - out.writeLong(age.duration()); - out.writeString(age.timeUnit().name()); - } + out.writeTimeValue(age); } } diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java index cb402e0e64a2b..662a9e1a4cd72 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java @@ -315,17 +315,10 @@ public static DataStream read(StreamInput in) throws IOException { if (in.getTransportVersion().onOrAfter(DataStream.ADDED_AUTO_SHARDING_EVENT_VERSION)) { backingIndicesBuilder.setAutoShardingEvent(in.readOptionalWriteable(DataStreamAutoShardingEvent::new)); } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - // Read the rollover on write flag from the stream, but force it on if the failure indices are empty and we're not replicating - boolean failureStoreRolloverOnWrite = in.readBoolean() || (replicated == false && failureIndices.isEmpty()); - failureIndicesBuilder.setRolloverOnWrite(failureStoreRolloverOnWrite) - .setAutoShardingEvent(in.readOptionalWriteable(DataStreamAutoShardingEvent::new)); - } else { - // If we are reading from an older version that does not have these fields, just default - // to a reasonable value for rollover on write for the failure store - boolean failureStoreRolloverOnWrite = replicated == false && failureIndices.isEmpty(); - failureIndicesBuilder.setRolloverOnWrite(failureStoreRolloverOnWrite); - } + // Read the rollover on write flag from the stream, but force it on if the failure indices are empty and we're not replicating + boolean failureStoreRolloverOnWrite = in.readBoolean() || (replicated == false && failureIndices.isEmpty()); + failureIndicesBuilder.setRolloverOnWrite(failureStoreRolloverOnWrite) + .setAutoShardingEvent(in.readOptionalWriteable(DataStreamAutoShardingEvent::new)); DataStreamOptions dataStreamOptions; if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { dataStreamOptions = in.readOptionalWriteable(DataStreamOptions::read); @@ -1468,10 +1461,8 @@ public void writeTo(StreamOutput out) throws IOException { if (out.getTransportVersion().onOrAfter(DataStream.ADDED_AUTO_SHARDING_EVENT_VERSION)) { out.writeOptionalWriteable(backingIndices.autoShardingEvent); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeBoolean(failureIndices.rolloverOnWrite); - out.writeOptionalWriteable(failureIndices.autoShardingEvent); - } + out.writeBoolean(failureIndices.rolloverOnWrite); + out.writeOptionalWriteable(failureIndices.autoShardingEvent); if (out.getTransportVersion().onOrAfter(DataStream.ADD_DATA_STREAM_OPTIONS_VERSION)) { out.writeOptionalWriteable(dataStreamOptions.isEmpty() ? null : dataStreamOptions); } diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java index 1de3df99aa60d..2270420b3dd0e 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java @@ -1717,21 +1717,13 @@ private static class IndexMetadataDiff implements Diff { DiffableUtils.getStringKeySerializer(), ROLLOVER_INFO_DIFF_VALUE_READER ); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - mappingsUpdatedVersion = IndexVersion.readVersion(in); - } else { - mappingsUpdatedVersion = IndexVersions.ZERO; - } + mappingsUpdatedVersion = IndexVersion.readVersion(in); isSystem = in.readBoolean(); timestampRange = IndexLongFieldRange.readFrom(in); stats = in.readOptionalWriteable(IndexMetadataStats::new); indexWriteLoadForecast = in.readOptionalDouble(); shardSizeInBytesForecast = in.readOptionalLong(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - eventIngestedRange = IndexLongFieldRange.readFrom(in); - } else { - eventIngestedRange = IndexLongFieldRange.UNKNOWN; - } + eventIngestedRange = IndexLongFieldRange.readFrom(in); if (in.getTransportVersion().supports(INDEX_RESHARDING_METADATA)) { reshardingMetadata = in.readOptionalWriteable(IndexReshardingMetadata::new); } else { @@ -1760,9 +1752,7 @@ public void writeTo(StreamOutput out) throws IOException { customData.writeTo(out); inSyncAllocationIds.writeTo(out); rolloverInfos.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - IndexVersion.writeVersion(mappingsUpdatedVersion, out); - } + IndexVersion.writeVersion(mappingsUpdatedVersion, out); out.writeBoolean(isSystem); timestampRange.writeTo(out); out.writeOptionalWriteable(stats); @@ -1864,9 +1854,7 @@ public static IndexMetadata readFrom(StreamInput in, @Nullable Function DiffableUtils.StringSetValueSerializer.getInstance().write(v, o) ); out.writeCollection(rolloverInfos.values()); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - IndexVersion.writeVersion(mappingsUpdatedVersion, out); - } + IndexVersion.writeVersion(mappingsUpdatedVersion, out); out.writeBoolean(isSystem); timestampRange.writeTo(out); out.writeOptionalWriteable(stats); diff --git a/server/src/main/java/org/elasticsearch/index/stats/IndexingPressureStats.java b/server/src/main/java/org/elasticsearch/index/stats/IndexingPressureStats.java index 8a21ddde3ace9..432c4434afaf2 100644 --- a/server/src/main/java/org/elasticsearch/index/stats/IndexingPressureStats.java +++ b/server/src/main/java/org/elasticsearch/index/stats/IndexingPressureStats.java @@ -89,11 +89,7 @@ public IndexingPressureStats(StreamInput in) throws IOException { primaryDocumentRejections = -1L; } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - totalCoordinatingRequests = in.readVLong(); - } else { - totalCoordinatingRequests = -1L; - } + totalCoordinatingRequests = in.readVLong(); lowWaterMarkSplits = in.readVLong(); highWaterMarkSplits = in.readVLong(); @@ -184,9 +180,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVLong(primaryDocumentRejections); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeVLong(totalCoordinatingRequests); - } + out.writeVLong(totalCoordinatingRequests); out.writeVLong(lowWaterMarkSplits); out.writeVLong(highWaterMarkSplits); diff --git a/server/src/main/java/org/elasticsearch/ingest/IngestStats.java b/server/src/main/java/org/elasticsearch/ingest/IngestStats.java index 00f8e215994e6..6d51ec100c55e 100644 --- a/server/src/main/java/org/elasticsearch/ingest/IngestStats.java +++ b/server/src/main/java/org/elasticsearch/ingest/IngestStats.java @@ -10,7 +10,6 @@ package org.elasticsearch.ingest; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.admin.cluster.node.stats.NodeStats; import org.elasticsearch.cluster.metadata.Metadata; import org.elasticsearch.cluster.metadata.ProjectId; @@ -88,7 +87,7 @@ public static IngestStats read(StreamInput in) throws IOException { : Metadata.DEFAULT_PROJECT_ID; var pipelineId = in.readString(); var pipelineStat = readStats(in); - var byteStat = in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0) ? readByteStats(in) : ByteStats.IDENTITY; + var byteStat = readByteStats(in); pipelineStats.add(new PipelineStat(projectId, pipelineId, pipelineStat, byteStat)); int processorsSize = in.readVInt(); var processorStatsPerPipeline = new ArrayList(processorsSize); @@ -117,9 +116,7 @@ public void writeTo(StreamOutput out) throws IOException { } out.writeString(pipelineStat.pipelineId()); pipelineStat.stats().writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - pipelineStat.byteStats().writeTo(out); - } + pipelineStat.byteStats().writeTo(out); List processorStatsForPipeline = processorStats.getOrDefault(pipelineStat.projectId(), Map.of()) .get(pipelineStat.pipelineId()); if (processorStatsForPipeline == null) { diff --git a/server/src/main/java/org/elasticsearch/search/builder/PointInTimeBuilder.java b/server/src/main/java/org/elasticsearch/search/builder/PointInTimeBuilder.java index 913dec7e56a39..0b5beeb927d0f 100644 --- a/server/src/main/java/org/elasticsearch/search/builder/PointInTimeBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/builder/PointInTimeBuilder.java @@ -9,7 +9,6 @@ package org.elasticsearch.search.builder; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.search.SearchContextId; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; @@ -63,21 +62,13 @@ public PointInTimeBuilder(BytesReference pitID) { } public PointInTimeBuilder(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - encodedId = in.readBytesReference(); - } else { - encodedId = new BytesArray(Base64.getUrlDecoder().decode(in.readString())); - } + encodedId = in.readBytesReference(); keepAlive = in.readOptionalTimeValue(); } @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeBytesReference(encodedId); - } else { - out.writeString(Base64.getUrlEncoder().encodeToString(BytesReference.toBytes(encodedId))); - } + out.writeBytesReference(encodedId); out.writeOptionalTimeValue(keepAlive); } diff --git a/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java b/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java index 534c764c07b7b..66c9d3b9d73b6 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java @@ -10,7 +10,6 @@ package org.elasticsearch.search.fetch; import org.apache.lucene.search.ScoreDoc; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.OriginalIndices; import org.elasticsearch.action.support.IndicesOptions; @@ -61,11 +60,7 @@ public ShardFetchSearchRequest(StreamInput in) throws IOException { shardSearchRequest = in.readOptionalWriteable(ShardSearchRequest::new); rescoreDocIds = new RescoreDocIds(in); aggregatedDfs = in.readOptionalWriteable(AggregatedDfs::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.rankDocs = in.readOptionalWriteable(RankDocShardInfo::new); - } else { - this.rankDocs = null; - } + this.rankDocs = in.readOptionalWriteable(RankDocShardInfo::new); } @Override @@ -75,9 +70,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(shardSearchRequest); rescoreDocIds.writeTo(out); out.writeOptionalWriteable(aggregatedDfs); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeOptionalWriteable(rankDocs); - } + out.writeOptionalWriteable(rankDocs); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/rank/feature/RankFeatureShardResult.java b/server/src/main/java/org/elasticsearch/search/rank/feature/RankFeatureShardResult.java index 13cf9f339d7d4..cdb7270245687 100644 --- a/server/src/main/java/org/elasticsearch/search/rank/feature/RankFeatureShardResult.java +++ b/server/src/main/java/org/elasticsearch/search/rank/feature/RankFeatureShardResult.java @@ -10,7 +10,6 @@ package org.elasticsearch.search.rank.feature; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.search.rank.RankShardResult; @@ -43,7 +42,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_15_0; + return TransportVersion.minimumCompatible(); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/vectors/ExactKnnQueryBuilder.java b/server/src/main/java/org/elasticsearch/search/vectors/ExactKnnQueryBuilder.java index 77d708432cf26..f1501dd5759e6 100644 --- a/server/src/main/java/org/elasticsearch/search/vectors/ExactKnnQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/vectors/ExactKnnQueryBuilder.java @@ -55,11 +55,7 @@ public ExactKnnQueryBuilder(StreamInput in) throws IOException { this.query = VectorData.fromFloats(in.readFloatArray()); } this.field = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.vectorSimilarity = in.readOptionalFloat(); - } else { - this.vectorSimilarity = null; - } + this.vectorSimilarity = in.readOptionalFloat(); } String getField() { @@ -87,9 +83,7 @@ protected void doWriteTo(StreamOutput out) throws IOException { out.writeFloatArray(query.asFloatVector()); } out.writeString(field); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeOptionalFloat(vectorSimilarity); - } + out.writeOptionalFloat(vectorSimilarity); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/vectors/KnnScoreDocQueryBuilder.java b/server/src/main/java/org/elasticsearch/search/vectors/KnnScoreDocQueryBuilder.java index 44cf2095b71c9..90953853e8e05 100644 --- a/server/src/main/java/org/elasticsearch/search/vectors/KnnScoreDocQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/vectors/KnnScoreDocQueryBuilder.java @@ -83,11 +83,7 @@ public KnnScoreDocQueryBuilder(StreamInput in) throws IOException { this.fieldName = null; this.queryVector = null; } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.vectorSimilarity = in.readOptionalFloat(); - } else { - this.vectorSimilarity = null; - } + this.vectorSimilarity = in.readOptionalFloat(); if (in.getTransportVersion().supports(TO_CHILD_BLOCK_JOIN_QUERY)) { this.filterQueries = readQueries(in); } else { @@ -132,9 +128,7 @@ protected void doWriteTo(StreamOutput out) throws IOException { out.writeBoolean(false); } } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeOptionalFloat(vectorSimilarity); - } + out.writeOptionalFloat(vectorSimilarity); if (out.getTransportVersion().supports(TO_CHILD_BLOCK_JOIN_QUERY)) { writeQueries(out, filterQueries); } diff --git a/server/src/main/java/org/elasticsearch/search/vectors/KnnSearchBuilder.java b/server/src/main/java/org/elasticsearch/search/vectors/KnnSearchBuilder.java index bcd9cdc0ebf31..6a83f6d8cf8b6 100644 --- a/server/src/main/java/org/elasticsearch/search/vectors/KnnSearchBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/vectors/KnnSearchBuilder.java @@ -339,11 +339,7 @@ public KnnSearchBuilder(StreamInput in) throws IOException { } this.filterQueries = in.readNamedWriteableCollectionAsList(QueryBuilder.class); this.boost = in.readFloat(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.queryName = in.readOptionalString(); - } else { - this.queryName = null; - } + this.queryName = in.readOptionalString(); this.queryVectorBuilder = in.readOptionalNamedWriteable(QueryVectorBuilder.class); this.querySupplier = null; if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { @@ -602,9 +598,7 @@ public void writeTo(StreamOutput out) throws IOException { } out.writeNamedWriteableCollection(filterQueries); out.writeFloat(boost); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeOptionalString(queryName); - } + out.writeOptionalString(queryName); out.writeOptionalNamedWriteable(queryVectorBuilder); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { out.writeOptionalFloat(similarity); diff --git a/server/src/main/java/org/elasticsearch/search/vectors/KnnVectorQueryBuilder.java b/server/src/main/java/org/elasticsearch/search/vectors/KnnVectorQueryBuilder.java index 5855f09de281d..035e943539880 100644 --- a/server/src/main/java/org/elasticsearch/search/vectors/KnnVectorQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/vectors/KnnVectorQueryBuilder.java @@ -257,11 +257,7 @@ private KnnVectorQueryBuilder( public KnnVectorQueryBuilder(StreamInput in) throws IOException { super(in); this.fieldName = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.k = in.readOptionalVInt(); - } else { - this.k = null; - } + this.k = in.readOptionalVInt(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { this.numCands = in.readOptionalVInt(); } else { @@ -349,9 +345,7 @@ protected void doWriteTo(StreamOutput out) throws IOException { throw new IllegalStateException("missing a rewriteAndFetch?"); } out.writeString(fieldName); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeOptionalVInt(k); - } + out.writeOptionalVInt(k); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { out.writeOptionalVInt(numCands); } else { diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestParametersTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestParametersTests.java index cfdbfdfbfcf8c..ff1825f48d5d2 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestParametersTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestParametersTests.java @@ -9,38 +9,12 @@ package org.elasticsearch.action.admin.cluster.node.stats; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsRequestParameters.Metric; -import org.elasticsearch.common.io.stream.ByteArrayStreamInput; -import org.elasticsearch.common.io.stream.BytesRefStreamOutput; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.EnumSerializationTestUtils; -import java.io.IOException; -import java.util.EnumSet; -import java.util.List; - public class NodesStatsRequestParametersTests extends ESTestCase { - public void testReadWriteMetricSet() { - for (var version : List.of(TransportVersions.V_8_15_0, TransportVersions.V_8_16_0)) { - var randSet = randomSubsetOf(Metric.ALL); - var metricsOut = randSet.isEmpty() ? EnumSet.noneOf(Metric.class) : EnumSet.copyOf(randSet); - try { - var out = new BytesRefStreamOutput(); - out.setTransportVersion(version); - Metric.writeSetTo(out, metricsOut); - var in = new ByteArrayStreamInput(out.get().bytes); - in.setTransportVersion(version); - var metricsIn = Metric.readSetFrom(in); - assertEquals(metricsOut, metricsIn); - } catch (IOException e) { - var errMsg = "metrics=" + metricsOut.toString(); - throw new AssertionError(errMsg, e); - } - } - } - // future-proof of accidental enum ordering change or extension public void testEnsureMetricOrdinalsOrder() { EnumSerializationTestUtils.assertEnumSerialization( diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestTests.java index e45e940334a9e..c872281134e76 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestTests.java @@ -10,7 +10,6 @@ package org.elasticsearch.action.admin.indices.close; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.support.ActiveShardCount; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.io.stream.BytesStreamOutput; @@ -50,9 +49,7 @@ public void testBwcSerialization() throws Exception { in.setTransportVersion(out.getTransportVersion()); assertEquals(request.getParentTask(), TaskId.readFromStream(in)); assertEquals(request.masterNodeTimeout(), in.readTimeValue()); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - assertEquals(request.masterTerm(), in.readVLong()); - } + assertEquals(request.masterTerm(), in.readVLong()); assertEquals(request.ackTimeout(), in.readTimeValue()); assertArrayEquals(request.indices(), in.readStringArray()); final IndicesOptions indicesOptions = IndicesOptions.readIndicesOptions(in); @@ -68,9 +65,7 @@ public void testBwcSerialization() throws Exception { out.setTransportVersion(version); sample.getParentTask().writeTo(out); out.writeTimeValue(sample.masterNodeTimeout()); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeVLong(sample.masterTerm()); - } + out.writeVLong(sample.masterTerm()); out.writeTimeValue(sample.ackTimeout()); out.writeStringArray(sample.indices()); sample.indicesOptions().writeIndicesOptions(out); diff --git a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStartedClusterStateTaskExecutorTests.java b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStartedClusterStateTaskExecutorTests.java index bbbf8404f1be7..db19e71bd4996 100644 --- a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStartedClusterStateTaskExecutorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStartedClusterStateTaskExecutorTests.java @@ -9,7 +9,6 @@ package org.elasticsearch.cluster.action.shard; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionTestUtils; import org.elasticsearch.cluster.ClusterState; @@ -439,18 +438,14 @@ public void testExpandsTimestampRangeForPrimary() throws Exception { } final var eventIngestedRange = resultingState.metadata().getProject().index(indexName).getEventIngestedRange(); - if (clusterState.getMinTransportVersion().before(TransportVersions.V_8_15_0)) { + if (shardEventIngestedRange == ShardLongFieldRange.UNKNOWN) { assertThat(eventIngestedRange, sameInstance(IndexLongFieldRange.UNKNOWN)); + } else if (shardEventIngestedRange == ShardLongFieldRange.EMPTY) { + assertThat(eventIngestedRange, sameInstance(IndexLongFieldRange.EMPTY)); } else { - if (shardEventIngestedRange == ShardLongFieldRange.UNKNOWN) { - assertThat(eventIngestedRange, sameInstance(IndexLongFieldRange.UNKNOWN)); - } else if (shardEventIngestedRange == ShardLongFieldRange.EMPTY) { - assertThat(eventIngestedRange, sameInstance(IndexLongFieldRange.EMPTY)); - } else { - assertTrue(eventIngestedRange.isComplete()); - assertThat(eventIngestedRange.getMin(), equalTo(shardEventIngestedRange.getMin())); - assertThat(eventIngestedRange.getMax(), equalTo(shardEventIngestedRange.getMax())); - } + assertTrue(eventIngestedRange.isComplete()); + assertThat(eventIngestedRange.getMin(), equalTo(shardEventIngestedRange.getMin())); + assertThat(eventIngestedRange.getMax(), equalTo(shardEventIngestedRange.getMax())); } } diff --git a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java index b189d7796b51a..69be2c304d28b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java @@ -12,7 +12,6 @@ import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.util.SetOnce; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.support.replication.ClusterStateCreationUtils; @@ -63,8 +62,6 @@ import static org.elasticsearch.test.ClusterServiceUtils.createClusterService; import static org.elasticsearch.test.ClusterServiceUtils.setState; -import static org.elasticsearch.test.TransportVersionUtils.getFirstVersion; -import static org.elasticsearch.test.TransportVersionUtils.getPreviousVersion; import static org.elasticsearch.test.TransportVersionUtils.randomCompatibleVersion; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; @@ -599,32 +596,7 @@ public void testStartedShardEntrySerialization() throws Exception { assertThat(deserialized.primaryTerm, equalTo(primaryTerm)); assertThat(deserialized.message, equalTo(message)); assertThat(deserialized.timestampRange, equalTo(timestampRange)); - if (version.before(TransportVersions.V_8_15_0)) { - assertThat(deserialized.eventIngestedRange, equalTo(ShardLongFieldRange.UNKNOWN)); - } else { - assertThat(deserialized.eventIngestedRange, equalTo(eventIngestedRange)); - } - } - } - - public void testStartedShardEntrySerializationWithOlderTransportVersion() throws Exception { - final ShardId shardId = new ShardId(randomRealisticUnicodeOfLengthBetween(10, 100), UUID.randomUUID().toString(), between(0, 1000)); - final String allocationId = randomRealisticUnicodeOfCodepointLengthBetween(10, 100); - final long primaryTerm = randomIntBetween(0, 100); - final String message = randomRealisticUnicodeOfCodepointLengthBetween(10, 100); - final TransportVersion version = randomFrom(getFirstVersion(), getPreviousVersion(TransportVersions.V_8_15_0)); - final ShardLongFieldRange timestampRange = ShardLongFieldRangeWireTests.randomRange(); - final ShardLongFieldRange eventIngestedRange = ShardLongFieldRangeWireTests.randomRange(); - var startedShardEntry = new StartedShardEntry(shardId, allocationId, primaryTerm, message, timestampRange, eventIngestedRange); - try (StreamInput in = serialize(startedShardEntry, version).streamInput()) { - in.setTransportVersion(version); - final StartedShardEntry deserialized = new StartedShardEntry(in); - assertThat(deserialized.shardId, equalTo(shardId)); - assertThat(deserialized.allocationId, equalTo(allocationId)); - assertThat(deserialized.primaryTerm, equalTo(primaryTerm)); - assertThat(deserialized.message, equalTo(message)); - assertThat(deserialized.timestampRange, equalTo(timestampRange)); - assertThat(deserialized.eventIngestedRange, equalTo(ShardLongFieldRange.UNKNOWN)); + assertThat(deserialized.eventIngestedRange, equalTo(eventIngestedRange)); } } diff --git a/server/src/test/java/org/elasticsearch/search/rank/RankFeatureShardPhaseTests.java b/server/src/test/java/org/elasticsearch/search/rank/RankFeatureShardPhaseTests.java index 1ffe05baf30a1..9c874e0a8f60e 100644 --- a/server/src/test/java/org/elasticsearch/search/rank/RankFeatureShardPhaseTests.java +++ b/server/src/test/java/org/elasticsearch/search/rank/RankFeatureShardPhaseTests.java @@ -13,7 +13,6 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TotalHits; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.client.internal.Client; import org.elasticsearch.common.document.DocumentField; @@ -201,7 +200,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_15_0; + return TransportVersion.minimumCompatible(); } }; }