Remove most uses of 7.5 and 7.6 transport versions (#118439)

thecoop · web-flow · commit 8a4fc7ceca1b · 2024-12-12T10:02:01.000Z
diff --git a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalRequest.java b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalRequest.java
@@ -9,7 +9,6 @@
 
 package org.elasticsearch.index.rankeval;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
@@ -46,9 +45,7 @@ public RankEvalRequest(RankEvalSpec rankingEvaluationSpec, String[] indices) {
         rankingEvaluationSpec = new RankEvalSpec(in);
         indices = in.readStringArray();
         indicesOptions = IndicesOptions.readIndicesOptions(in);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_6_0)) {
-            searchType = SearchType.fromId(in.readByte());
-        }
+        searchType = SearchType.fromId(in.readByte());
     }
 
     RankEvalRequest() {}
@@ -127,9 +124,7 @@ public void writeTo(StreamOutput out) throws IOException {
         rankingEvaluationSpec.writeTo(out);
         out.writeStringArray(indices);
         indicesOptions.writeIndicesOptions(out);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_6_0)) {
-            out.writeByte(searchType.id());
-        }
+        out.writeByte(searchType.id());
     }
 
     @Override
diff --git a/server/src/main/java/org/elasticsearch/ElasticsearchException.java b/server/src/main/java/org/elasticsearch/ElasticsearchException.java
@@ -40,7 +40,6 @@
 import org.elasticsearch.persistent.PersistentTaskNodeNotAssignedException;
 import org.elasticsearch.rest.ApiNotAvailableException;
 import org.elasticsearch.rest.RestStatus;
-import org.elasticsearch.search.SearchException;
 import org.elasticsearch.search.TooManyScrollContextsException;
 import org.elasticsearch.search.aggregations.AggregationExecutionException;
 import org.elasticsearch.search.aggregations.MultiBucketConsumerService;
@@ -319,10 +318,6 @@ protected void writeTo(StreamOutput out, Writer<Throwable> nestedExceptionsWrite
     public static ElasticsearchException readException(StreamInput input, int id) throws IOException {
         CheckedFunction<StreamInput, ? extends ElasticsearchException, IOException> elasticsearchException = ID_TO_SUPPLIER.get(id);
         if (elasticsearchException == null) {
-            if (id == 127 && input.getTransportVersion().before(TransportVersions.V_7_5_0)) {
-                // was SearchContextException
-                return new SearchException(input);
-            }
             throw new IllegalStateException("unknown exception for id: " + id);
         }
         return elasticsearchException.apply(input);
@@ -1817,13 +1812,13 @@ private enum ElasticsearchExceptionHandle {
             org.elasticsearch.index.seqno.RetentionLeaseInvalidRetainingSeqNoException.class,
             org.elasticsearch.index.seqno.RetentionLeaseInvalidRetainingSeqNoException::new,
             156,
-            TransportVersions.V_7_5_0
+            UNKNOWN_VERSION_ADDED
         ),
         INGEST_PROCESSOR_EXCEPTION(
             org.elasticsearch.ingest.IngestProcessorException.class,
             org.elasticsearch.ingest.IngestProcessorException::new,
             157,
-            TransportVersions.V_7_5_0
+            UNKNOWN_VERSION_ADDED
         ),
         PEER_RECOVERY_NOT_FOUND_EXCEPTION(
             org.elasticsearch.indices.recovery.PeerRecoveryNotFound.class,
diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java
@@ -54,7 +54,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion V_7_0_0 = def(7_00_00_99);
     public static final TransportVersion V_7_3_0 = def(7_03_00_99);
     public static final TransportVersion V_7_4_0 = def(7_04_00_99);
-    public static final TransportVersion V_7_5_0 = def(7_05_00_99);
     public static final TransportVersion V_7_6_0 = def(7_06_00_99);
     public static final TransportVersion V_7_7_0 = def(7_07_00_99);
     public static final TransportVersion V_7_8_0 = def(7_08_00_99);
diff --git 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.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.FailedNodeException;
 import org.elasticsearch.action.support.ActionFilters;
@@ -239,11 +238,7 @@ public static class NodeRequest extends TransportRequest {
         public NodeRequest(StreamInput in) throws IOException {
             super(in);
             shardId = new ShardId(in);
-            if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_6_0)) {
-                customDataPath = in.readString();
-            } else {
-                customDataPath = null;
-            }
+            customDataPath = in.readString();
         }
 
         public NodeRequest(Request request) {
@@ -255,10 +250,7 @@ public NodeRequest(Request request) {
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             shardId.writeTo(out);
-            if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_6_0)) {
-                assert customDataPath != null;
-                out.writeString(customDataPath);
-            }
+            out.writeString(customDataPath);
         }
 
         public ShardId getShardId() {
diff --git a/server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java b/server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java
@@ -18,8 +18,6 @@
 import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -49,25 +47,14 @@ public RemoteConnectionInfo(
     }
 
     public RemoteConnectionInfo(StreamInput input) throws IOException {
-        if (input.getTransportVersion().onOrAfter(TransportVersions.V_7_6_0)) {
-            RemoteConnectionStrategy.ConnectionStrategy mode = input.readEnum(RemoteConnectionStrategy.ConnectionStrategy.class);
-            modeInfo = mode.getReader().read(input);
-            initialConnectionTimeout = input.readTimeValue();
-            clusterAlias = input.readString();
-            skipUnavailable = input.readBoolean();
-            if (input.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
-                hasClusterCredentials = input.readBoolean();
-            } else {
-                hasClusterCredentials = false;
-            }
+        RemoteConnectionStrategy.ConnectionStrategy mode = input.readEnum(RemoteConnectionStrategy.ConnectionStrategy.class);
+        modeInfo = mode.getReader().read(input);
+        initialConnectionTimeout = input.readTimeValue();
+        clusterAlias = input.readString();
+        skipUnavailable = input.readBoolean();
+        if (input.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
+            hasClusterCredentials = input.readBoolean();
         } else {
-            List<String> seedNodes = Arrays.asList(input.readStringArray());
-            int connectionsPerCluster = input.readVInt();
-            initialConnectionTimeout = input.readTimeValue();
-            int numNodesConnected = input.readVInt();
-            clusterAlias = input.readString();
-            skipUnavailable = input.readBoolean();
-            modeInfo = new SniffConnectionStrategy.SniffModeInfo(seedNodes, connectionsPerCluster, numNodesConnected);
             hasClusterCredentials = false;
         }
     }
@@ -90,24 +77,9 @@ public boolean hasClusterCredentials() {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_6_0)) {
-            out.writeEnum(modeInfo.modeType());
-            modeInfo.writeTo(out);
-            out.writeTimeValue(initialConnectionTimeout);
-        } else {
-            if (modeInfo.modeType() == RemoteConnectionStrategy.ConnectionStrategy.SNIFF) {
-                SniffConnectionStrategy.SniffModeInfo sniffInfo = (SniffConnectionStrategy.SniffModeInfo) this.modeInfo;
-                out.writeStringCollection(sniffInfo.seedNodes);
-                out.writeVInt(sniffInfo.maxConnectionsPerCluster);
-                out.writeTimeValue(initialConnectionTimeout);
-                out.writeVInt(sniffInfo.numNodesConnected);
-            } else {
-                out.writeStringArray(new String[0]);
-                out.writeVInt(0);
-                out.writeTimeValue(initialConnectionTimeout);
-                out.writeVInt(0);
-            }
-        }
+        out.writeEnum(modeInfo.modeType());
+        modeInfo.writeTo(out);
+        out.writeTimeValue(initialConnectionTimeout);
         out.writeString(clusterAlias);
         out.writeBoolean(skipUnavailable);
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/stringstats/StringStatsAggregationBuilder.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/stringstats/StringStatsAggregationBuilder.java
@@ -154,6 +154,6 @@ public boolean equals(Object obj) {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_6_0;
+        return TransportVersions.ZERO;
     }
 }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ccr/AutoFollowMetadata.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ccr/AutoFollowMetadata.java
@@ -282,11 +282,7 @@ private AutoFollowPattern(
             this.leaderIndexPatterns = leaderIndexPatterns;
             this.followIndexPattern = followIndexPattern;
             this.settings = Objects.requireNonNull(settings);
-            if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_5_0)) {
-                this.active = in.readBoolean();
-            } else {
-                this.active = true;
-            }
+            this.active = in.readBoolean();
             if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_14_0)) {
                 this.leaderIndexExclusionPatterns = in.readStringCollectionAsList();
             } else {
@@ -351,9 +347,7 @@ public void writeTo(StreamOutput out) throws IOException {
                 settings.writeTo(out);
             }
             super.writeTo(out);
-            if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_5_0)) {
-                out.writeBoolean(active);
-            }
+            out.writeBoolean(active);
             if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_14_0)) {
                 out.writeStringCollection(leaderIndexExclusionPatterns);
             }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/enrich/EnrichFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/enrich/EnrichFeatureSetUsage.java
@@ -27,6 +27,6 @@ public EnrichFeatureSetUsage(StreamInput input) throws IOException {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_5_0;
+        return TransportVersions.ZERO;
     }
 }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/enrich/EnrichMetadata.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/enrich/EnrichMetadata.java
@@ -84,7 +84,7 @@ public EnumSet<Metadata.XContentContext> context() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_5_0;
+        return TransportVersions.ZERO;
     }
 
     @Override
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityFeatureSetUsage.java
@@ -61,9 +61,7 @@ public SecurityFeatureSetUsage(StreamInput in) throws IOException {
         ipFilterUsage = in.readGenericMap();
         anonymousUsage = in.readGenericMap();
         roleMappingStoreUsage = in.readGenericMap();
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_5_0)) {
-            fips140Usage = in.readGenericMap();
-        }
+        fips140Usage = in.readGenericMap();
         if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) {
             operatorPrivilegesUsage = in.readGenericMap();
         }
@@ -129,9 +127,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeGenericMap(ipFilterUsage);
         out.writeGenericMap(anonymousUsage);
         out.writeGenericMap(roleMappingStoreUsage);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_5_0)) {
-            out.writeGenericMap(fips140Usage);
-        }
+        out.writeGenericMap(fips140Usage);
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) {
             out.writeGenericMap(operatorPrivilegesUsage);
         }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlPrepareAuthenticationRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlPrepareAuthenticationRequest.java
@@ -6,7 +6,6 @@
  */
 package org.elasticsearch.xpack.core.security.action.saml;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -33,9 +32,7 @@ public SamlPrepareAuthenticationRequest(StreamInput in) throws IOException {
         super(in);
         realmName = in.readOptionalString();
         assertionConsumerServiceURL = in.readOptionalString();
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_5_0)) {
-            relayState = in.readOptionalString();
-        }
+        relayState = in.readOptionalString();
     }
 
     public SamlPrepareAuthenticationRequest() {}
@@ -87,8 +84,6 @@ public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeOptionalString(realmName);
         out.writeOptionalString(assertionConsumerServiceURL);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_5_0)) {
-            out.writeOptionalString(relayState);
-        }
+        out.writeOptionalString(relayState);
     }
 }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SLMFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SLMFeatureSetUsage.java
@@ -41,7 +41,7 @@ public SLMFeatureSetUsage(@Nullable SnapshotLifecycleStats slmStats) {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_5_0;
+        return TransportVersions.ZERO;
     }
 
     public SnapshotLifecycleStats getStats() {
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/TransformFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/TransformFeatureSetUsage.java
@@ -50,7 +50,7 @@ public TransformFeatureSetUsage(
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_5_0;
+        return TransportVersions.ZERO;
     }
 
     @Override
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/TransformStateTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/TransformStateTests.java
@@ -7,9 +7,6 @@
 
 package org.elasticsearch.xpack.core.transform.transforms;
 
-import org.elasticsearch.TransportVersions;
-import org.elasticsearch.common.io.stream.BytesStreamOutput;
-import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.Writeable.Reader;
 import org.elasticsearch.test.AbstractXContentSerializingTestCase;
 import org.elasticsearch.xcontent.XContentParser;
@@ -66,39 +63,4 @@ protected boolean supportsUnknownFields() {
     protected Predicate<String> getRandomFieldsExcludeFilter() {
         return field -> field.isEmpty() == false;
     }
-
-    public void testBackwardsSerialization() throws IOException {
-        TransformState state = new TransformState(
-            randomFrom(TransformTaskState.values()),
-            randomFrom(IndexerState.values()),
-            TransformIndexerPositionTests.randomTransformIndexerPosition(),
-            randomLongBetween(0, 10),
-            randomBoolean() ? null : randomAlphaOfLength(10),
-            randomBoolean() ? null : randomTransformProgress(),
-            randomBoolean() ? null : randomNodeAttributes(),
-            false,
-            randomBoolean() ? null : AuthorizationStateTests.randomAuthorizationState()
-        );
-        // auth_state will be null after BWC deserialization
-        TransformState expectedState = new TransformState(
-            state.getTaskState(),
-            state.getIndexerState(),
-            state.getPosition(),
-            state.getCheckpoint(),
-            state.getReason(),
-            state.getProgress(),
-            state.getNode(),
-            state.shouldStopAtNextCheckpoint(),
-            null
-        );
-        try (BytesStreamOutput output = new BytesStreamOutput()) {
-            output.setTransportVersion(TransportVersions.V_7_5_0);
-            state.writeTo(output);
-            try (StreamInput in = output.bytes().streamInput()) {
-                in.setTransportVersion(TransportVersions.V_7_5_0);
-                TransformState streamedState = new TransformState(in);
-                assertEquals(expectedState, streamedState);
-            }
-        }
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,6 @@ public boolean equals(Object obj) {`
`154`	`154`
`155`	`155`	`@Override`
`156`	`156`	`public TransportVersion getMinimalSupportedVersion() {`
`157`		`- return TransportVersions.V_7_6_0;`
	`157`	`+ return TransportVersions.ZERO;`
`158`	`158`	`}`
`159`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ public EnrichFeatureSetUsage(StreamInput input) throws IOException {`
`27`	`27`
`28`	`28`	`@Override`
`29`	`29`	`public TransportVersion getMinimalSupportedVersion() {`
`30`		`- return TransportVersions.V_7_5_0;`
	`30`	`+ return TransportVersions.ZERO;`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public EnumSet<Metadata.XContentContext> context() {`
`84`	`84`
`85`	`85`	`@Override`
`86`	`86`	`public TransportVersion getMinimalSupportedVersion() {`
`87`		`- return TransportVersions.V_7_5_0;`
	`87`	`+ return TransportVersions.ZERO;`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`@Override`