Remove transport version constant V_8_18_0 (elastic#138844) (elastic#138925)

ES-13702

Author: jdconrad

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

@@ -13,7 +13,7 @@
 
 import com.carrotsearch.randomizedtesting.annotations.Name;
 
-import org.elasticsearch.TransportVersions;
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.ResponseException;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
@@ -39,7 +39,7 @@ public void testAddBlock() throws Exception {
         } else if (isMixedCluster()) {
             blockWrites();
             // this is used both for upgrading from 9.0.0 to current and from 8.18 to current.
-            if (minimumTransportVersion().supports(TransportVersions.V_8_18_0) == false) {
+            if (minimumTransportVersion().supports(TransportVersion.fromId(8840000)) == false) {
                 assertNull(verifiedSettingValue());
             } else {
                 assertThat(verifiedSettingValue(), Matchers.equalTo("true"));

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

@@ -97,7 +97,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_3 = def(8_797_0_03);
     public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_4 = def(8_797_0_04);
     public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_5 = def(8_797_0_05);
-    public static final TransportVersion V_8_18_0 = def(8_840_0_00);
 
     /*
      * STOP! READ THIS FIRST! No, really,

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

@@ -52,11 +52,7 @@ public ClusterStatsNodeResponse(StreamInput in) throws IOException {
             repositoryUsageStats = RepositoryUsageStats.EMPTY;
             searchCcsMetrics = new CCSTelemetrySnapshot();
         }
-        if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
-            esqlCcsMetrics = new CCSTelemetrySnapshot(in);
-        } else {
-            esqlCcsMetrics = new CCSTelemetrySnapshot();
-        }
+        esqlCcsMetrics = new CCSTelemetrySnapshot(in);
     }
 
     public ClusterStatsNodeResponse(
@@ -131,9 +127,7 @@ public void writeTo(StreamOutput out) throws IOException {
             repositoryUsageStats.writeTo(out);
             searchCcsMetrics.writeTo(out);
         } // else just drop these stats, ok for bwc
-        if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
-            esqlCcsMetrics.writeTo(out);
-        }
+        esqlCcsMetrics.writeTo(out);
     }
 
 }

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

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.action.admin.cluster.stats;
 
-import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.metadata.MappingMetadata;
@@ -270,9 +269,7 @@ private static int countOccurrences(String script, Pattern pattern) {
         fieldTypeStats = in.readCollectionAsImmutableList(FieldStats::new);
         runtimeFieldStats = in.readCollectionAsImmutableList(RuntimeFieldStats::new);
         var transportVersion = in.getTransportVersion();
-        sourceModeUsageCount = canReadOrWriteSourceModeTelemetry(transportVersion)
-            ? in.readImmutableMap(StreamInput::readString, StreamInput::readVInt)
-            : Map.of();
+        sourceModeUsageCount = in.readImmutableMap(StreamInput::readString, StreamInput::readVInt);
     }
 
     @Override
@@ -284,14 +281,7 @@ public void writeTo(StreamOutput out) throws IOException {
         }
         out.writeCollection(fieldTypeStats);
         out.writeCollection(runtimeFieldStats);
-        var transportVersion = out.getTransportVersion();
-        if (canReadOrWriteSourceModeTelemetry(transportVersion)) {
-            out.writeMap(sourceModeUsageCount, StreamOutput::writeVInt);
-        }
-    }
-
-    private static boolean canReadOrWriteSourceModeTelemetry(TransportVersion version) {
-        return version.isPatchFrom(TransportVersions.V_8_17_0) || version.supports(TransportVersions.V_8_18_0);
+        out.writeMap(sourceModeUsageCount, StreamOutput::writeVInt);
     }
 
     private static OptionalLong ofNullable(Long l) {

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

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.action.admin.indices.readonly;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
@@ -40,11 +39,7 @@ public AddIndexBlockRequest(StreamInput in) throws IOException {
         indices = in.readStringArray();
         indicesOptions = IndicesOptions.readIndicesOptions(in);
         block = APIBlock.readFrom(in);
-        if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
-            markVerified = in.readBoolean();
-        } else {
-            markVerified = false;
-        }
+        markVerified = in.readBoolean();
     }
 
     /**
@@ -132,9 +127,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeStringArray(indices);
         indicesOptions.writeIndicesOptions(out);
         block.writeTo(out);
-        if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
-            out.writeBoolean(markVerified);
-        }
+        out.writeBoolean(markVerified);
     }
 
     @Override

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

@@ -8,7 +8,6 @@
  */
 package org.elasticsearch.action.admin.indices.readonly;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.admin.indices.flush.FlushRequest;
@@ -181,11 +180,7 @@ public static final class ShardRequest extends ReplicationRequest<ShardRequest>
         ShardRequest(StreamInput in) throws IOException {
             super(in);
             clusterBlock = new ClusterBlock(in);
-            if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
-                phase1 = in.readBoolean();
-            } else {
-                phase1 = true; // does not matter, not verified anyway
-            }
+            phase1 = in.readBoolean();
         }
 
         public ShardRequest(final ShardId shardId, final ClusterBlock clusterBlock, boolean phase1, final TaskId parentTaskId) {
@@ -204,9 +199,7 @@ public String toString() {
         public void writeTo(final StreamOutput out) throws IOException {
             super.writeTo(out);
             clusterBlock.writeTo(out);
-            if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
-                out.writeBoolean(phase1);
-            }
+            out.writeBoolean(phase1);
         }
 
         public ClusterBlock clusterBlock() {

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

@@ -84,14 +84,9 @@ public ResolveClusterActionRequest(StreamInput in) throws IOException {
         this.names = in.readStringArray();
         this.indicesOptions = IndicesOptions.readIndicesOptions(in);
         this.localIndicesRequested = localIndicesPresent(names);
-        if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
-            this.clusterInfoOnly = in.readBoolean();
-            this.isQueryingCluster = in.readBoolean();
-            this.timeout = in.readOptionalTimeValue();
-        } else {
-            this.clusterInfoOnly = false;
-            this.isQueryingCluster = false;
-        }
+        this.clusterInfoOnly = in.readBoolean();
+        this.isQueryingCluster = in.readBoolean();
+        this.timeout = in.readOptionalTimeValue();
     }
 
     @Override
@@ -102,11 +97,9 @@ public void writeTo(StreamOutput out) throws IOException {
         }
         out.writeStringArray(names);
         indicesOptions.writeIndicesOptions(out);
-        if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
-            out.writeBoolean(clusterInfoOnly);
-            out.writeBoolean(isQueryingCluster);
-            out.writeOptionalTimeValue(timeout);
-        }
+        out.writeBoolean(clusterInfoOnly);
+        out.writeBoolean(isQueryingCluster);
+        out.writeOptionalTimeValue(timeout);
     }
 
     static String createVersionErrorMessage(TransportVersion versionFound) {

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

@@ -112,9 +112,7 @@ public BulkRequest(StreamInput in) throws IOException {
         } else {
             incrementalState = BulkRequest.IncrementalState.EMPTY;
         }
-        if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
-            includeSourceOnError = in.readBoolean();
-        } // else default value is true
+        includeSourceOnError = in.readBoolean();
         if (in.getTransportVersion().supports(STREAMS_ENDPOINT_PARAM_RESTRICTIONS)) {
             paramsUsed = in.readCollectionAsImmutableSet(StreamInput::readString);
         }
@@ -481,9 +479,7 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
             incrementalState.writeTo(out);
         }
-        if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
-            out.writeBoolean(includeSourceOnError);
-        }
+        out.writeBoolean(includeSourceOnError);
         if (out.getTransportVersion().supports(STREAMS_ENDPOINT_PARAM_RESTRICTIONS)) {
             out.writeCollection(paramsUsed, StreamOutput::writeString);
         }

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

@@ -339,9 +339,7 @@ public String getIndexModeName() {
             @Override
             public void writeTo(StreamOutput out) throws IOException {
                 dataStream.writeTo(out);
-                if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
-                    out.writeBoolean(failureStoreEffectivelyEnabled);
-                }
+                out.writeBoolean(failureStoreEffectivelyEnabled);
                 dataStreamStatus.writeTo(out);
                 out.writeOptionalString(indexTemplate);
                 out.writeOptionalString(ilmPolicyName);

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

@@ -227,9 +227,7 @@ public IndexRequest(@Nullable ShardId shardId, StreamInput in) throws IOExceptio
             }
         }
 
-        if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
-            includeSourceOnError = in.readBoolean();
-        } // else default value is true
+        includeSourceOnError = in.readBoolean();
 
         if (in.getTransportVersion().supports(INDEX_REQUEST_INCLUDE_TSID)) {
             tsid = in.readBytesRefOrNullIfEmpty();
@@ -817,9 +815,7 @@ private void writeBody(StreamOutput out) throws IOException {
                 out.writeBoolean(false); // obsolete originatesFromUpdateByDoc
             }
         }
-        if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
-            out.writeBoolean(includeSourceOnError);
-        }
+        out.writeBoolean(includeSourceOnError);
         if (out.getTransportVersion().supports(INDEX_REQUEST_INCLUDE_TSID)) {
             out.writeBytesRef(tsid);
         }