Reapply "Remove transport version V_8_17_0 (elastic#136311)" (elastic#136500) (elastic#139144)

jdconrad · web-flow · commit ec309283496b · 2025-12-08T14:02:59.000-08:00
This reverts commit ef42c70.
diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java
@@ -69,10 +69,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion V_8_16_1 = def(8_772_0_04);
     public static final TransportVersion INITIAL_ELASTICSEARCH_8_16_5 = def(8_772_0_05);
     public static final TransportVersion INITIAL_ELASTICSEARCH_8_16_6 = def(8_772_0_06);
-    public static final TransportVersion V_8_17_0 = def(8_797_0_02);
-    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);
 
     /*
      * STOP! READ THIS FIRST! No, really,
diff --git a/server/src/main/java/org/elasticsearch/action/bulk/SimulateBulkRequest.java b/server/src/main/java/org/elasticsearch/action/bulk/SimulateBulkRequest.java
@@ -151,11 +151,7 @@ public SimulateBulkRequest(StreamInput in) throws IOException {
             componentTemplateSubstitutions = Map.of();
             indexTemplateSubstitutions = Map.of();
         }
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
-            this.mappingAddition = (Map<String, Object>) in.readGenericValue();
-        } else {
-            mappingAddition = Map.of();
-        }
+        this.mappingAddition = (Map<String, Object>) in.readGenericValue();
         if (in.getTransportVersion().supports(SIMULATE_INGEST_MAPPING_MERGE_TYPE)) {
             mappingMergeType = in.readOptionalString();
         } else {
@@ -171,9 +167,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeGenericValue(componentTemplateSubstitutions);
             out.writeGenericValue(indexTemplateSubstitutions);
         }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
-            out.writeGenericValue(mappingAddition);
-        }
+        out.writeGenericValue(mappingAddition);
         if (out.getTransportVersion().supports(SIMULATE_INGEST_MAPPING_MERGE_TYPE)) {
             out.writeOptionalString(mappingMergeType);
         }
diff --git a/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java b/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java
@@ -211,16 +211,6 @@ public IndexRequest(@Nullable ShardId shardId, StreamInput in) throws IOExceptio
             requireDataStream = false;
         }
 
-        if (in.getTransportVersion().before(TransportVersions.V_8_17_0)) {
-            if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
-                in.readZLong(); // obsolete normalisedBytesParsed
-            }
-            if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
-                in.readBoolean(); // obsolete originatesFromUpdateByScript
-                in.readBoolean(); // obsolete originatesFromUpdateByDoc
-            }
-        }
-
         includeSourceOnError = in.readBoolean();
 
         if (in.getTransportVersion().supports(INDEX_REQUEST_INCLUDE_TSID)) {
@@ -797,15 +787,6 @@ private void writeBody(StreamOutput out) throws IOException {
             out.writeBoolean(requireDataStream);
         }
 
-        if (out.getTransportVersion().before(TransportVersions.V_8_17_0)) {
-            if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
-                out.writeZLong(-1);  // obsolete normalisedBytesParsed
-            }
-            if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
-                out.writeBoolean(false); // obsolete originatesFromUpdateByScript
-                out.writeBoolean(false); // obsolete originatesFromUpdateByDoc
-            }
-        }
         out.writeBoolean(includeSourceOnError);
         if (out.getTransportVersion().supports(INDEX_REQUEST_INCLUDE_TSID)) {
             out.writeBytesRef(tsid);
diff --git a/server/src/main/java/org/elasticsearch/index/IndexMode.java b/server/src/main/java/org/elasticsearch/index/IndexMode.java
@@ -9,7 +9,6 @@
 
 package org.elasticsearch.index;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.metadata.MetadataCreateDataStreamService;
 import org.elasticsearch.cluster.metadata.ProjectMetadata;
@@ -629,7 +628,7 @@ public static void writeTo(IndexMode indexMode, StreamOutput out) throws IOExcep
             case STANDARD -> 0;
             case TIME_SERIES -> 1;
             case LOGSDB -> 2;
-            case LOOKUP -> out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0) ? 3 : 0;
+            case LOOKUP -> 3;
         };
         out.writeByte((byte) code);
     }
diff --git a/server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java b/server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java
@@ -10,7 +10,6 @@
 package org.elasticsearch.ingest;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.cluster.Diff;
 import org.elasticsearch.cluster.SimpleDiffable;
 import org.elasticsearch.common.Strings;
@@ -25,7 +24,6 @@
 import org.elasticsearch.xcontent.ToXContentObject;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentType;
-import org.elasticsearch.xcontent.json.JsonXContent;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -172,13 +170,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
     public static PipelineConfiguration readFrom(StreamInput in) throws IOException {
         final String id = in.readString();
         final Map<String, Object> config;
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
-            config = in.readGenericMap();
-        } else {
-            final BytesReference bytes = in.readSlicedBytesReference();
-            final XContentType type = in.readEnum(XContentType.class);
-            config = XContentHelper.convertToMap(bytes, true, type).v2();
-        }
+        config = in.readGenericMap();
         return new PipelineConfiguration(id, config);
     }
 
@@ -196,14 +188,7 @@ public void writeTo(StreamOutput out) throws IOException {
         final TransportVersion transportVersion = out.getTransportVersion();
         final Map<String, Object> configForTransport = configForTransport(transportVersion);
         out.writeString(id);
-        if (transportVersion.onOrAfter(TransportVersions.V_8_17_0)) {
-            out.writeGenericMap(configForTransport);
-        } else {
-            XContentBuilder builder = XContentBuilder.builder(JsonXContent.jsonXContent).prettyPrint();
-            builder.map(configForTransport);
-            out.writeBytesReference(BytesReference.bytes(builder));
-            XContentHelper.writeTo(out, XContentType.JSON);
-        }
+        out.writeGenericMap(configForTransport);
     }
 
     @Override
diff --git a/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java b/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java
@@ -12,7 +12,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 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.common.io.stream.Writeable;
@@ -499,11 +498,7 @@ public Cgroup(
 
         Cgroup(final StreamInput in) throws IOException {
             cpuAcctControlGroup = in.readString();
-            if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
-                cpuAcctUsageNanos = in.readBigInteger();
-            } else {
-                cpuAcctUsageNanos = BigInteger.valueOf(in.readLong());
-            }
+            cpuAcctUsageNanos = in.readBigInteger();
             cpuControlGroup = in.readString();
             cpuCfsPeriodMicros = in.readLong();
             cpuCfsQuotaMicros = in.readLong();
@@ -516,11 +511,7 @@ public Cgroup(
         @Override
         public void writeTo(final StreamOutput out) throws IOException {
             out.writeString(cpuAcctControlGroup);
-            if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
-                out.writeBigInteger(cpuAcctUsageNanos);
-            } else {
-                out.writeLong(cpuAcctUsageNanos.longValue());
-            }
+            out.writeBigInteger(cpuAcctUsageNanos);
             out.writeString(cpuControlGroup);
             out.writeLong(cpuCfsPeriodMicros);
             out.writeLong(cpuCfsQuotaMicros);
@@ -616,28 +607,16 @@ public CpuStat(
             }
 
             CpuStat(final StreamInput in) throws IOException {
-                if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
-                    numberOfElapsedPeriods = in.readBigInteger();
-                    numberOfTimesThrottled = in.readBigInteger();
-                    timeThrottledNanos = in.readBigInteger();
-                } else {
-                    numberOfElapsedPeriods = BigInteger.valueOf(in.readLong());
-                    numberOfTimesThrottled = BigInteger.valueOf(in.readLong());
-                    timeThrottledNanos = BigInteger.valueOf(in.readLong());
-                }
+                numberOfElapsedPeriods = in.readBigInteger();
+                numberOfTimesThrottled = in.readBigInteger();
+                timeThrottledNanos = in.readBigInteger();
             }
 
             @Override
             public void writeTo(final StreamOutput out) throws IOException {
-                if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
-                    out.writeBigInteger(numberOfElapsedPeriods);
-                    out.writeBigInteger(numberOfTimesThrottled);
-                    out.writeBigInteger(timeThrottledNanos);
-                } else {
-                    out.writeLong(numberOfElapsedPeriods.longValue());
-                    out.writeLong(numberOfTimesThrottled.longValue());
-                    out.writeLong(timeThrottledNanos.longValue());
-                }
+                out.writeBigInteger(numberOfElapsedPeriods);
+                out.writeBigInteger(numberOfTimesThrottled);
+                out.writeBigInteger(timeThrottledNanos);
             }
 
             @Override
diff --git a/server/src/test/java/org/elasticsearch/TransportVersionTests.java b/server/src/test/java/org/elasticsearch/TransportVersionTests.java
@@ -427,7 +427,7 @@ public void testTransportVersionsLocked() {
             "TransportVersions.java is locked. Generate transport versions with TransportVersion.fromName "
                 + "and generateTransportVersion gradle task",
             TransportVersions.DEFINED_VERSIONS.getLast().id(),
-            equalTo(8_797_0_05)
+            equalTo(8_772_0_06)
         );
     }
 }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/application/LogsDBFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/application/LogsDBFeatureSetUsage.java
@@ -7,7 +7,6 @@
 package org.elasticsearch.xpack.core.application;
 
 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.xcontent.XContentBuilder;
@@ -28,13 +27,8 @@ public LogsDBFeatureSetUsage(StreamInput input) throws IOException {
         super(input);
         indicesCount = input.readVInt();
         indicesWithSyntheticSource = input.readVInt();
-        if (input.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
-            numDocs = input.readVLong();
-            sizeInBytes = input.readVLong();
-        } else {
-            numDocs = 0;
-            sizeInBytes = 0;
-        }
+        numDocs = input.readVLong();
+        sizeInBytes = input.readVLong();
         hasCustomCutoffDate = input.readBoolean();
     }
 
@@ -43,10 +37,8 @@ public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeVInt(indicesCount);
         out.writeVInt(indicesWithSyntheticSource);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
-            out.writeVLong(numDocs);
-            out.writeVLong(sizeInBytes);
-        }
+        out.writeVLong(numDocs);
+        out.writeVLong(sizeInBytes);
         out.writeBoolean(hasCustomCutoffDate);
     }
 
@@ -69,7 +61,7 @@ public LogsDBFeatureSetUsage(
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_8_17_0;
+        return TransportVersion.minimumCompatible();
     }
 
     @Override
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/permission/RemoteClusterPermissions.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/permission/RemoteClusterPermissions.java
@@ -69,7 +69,7 @@
 public class RemoteClusterPermissions implements NamedWriteable, ToXContentObject {
 
     public static final TransportVersion ROLE_REMOTE_CLUSTER_PRIVS = TransportVersions.V_8_15_0;
-    public static final TransportVersion ROLE_MONITOR_STATS = TransportVersions.V_8_17_0;
+    public static final TransportVersion ROLE_MONITOR_STATS = TransportVersion.fromId(8797002);
 
     public static final String NAME = "remote_cluster_permissions";
     private static final Logger logger = LogManager.getLogger(RemoteClusterPermissions.class);
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/action/InferenceActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/action/InferenceActionRequestTests.java
@@ -677,18 +677,6 @@ public void testWriteTo_ForHasBeenReroutedChanges() throws IOException {
             InferenceAction.Request.DEFAULT_TIMEOUT,
             false
         );
-
-        {
-            // From a version before the rerouting logic was added
-            InferenceAction.Request deserializedInstance = copyWriteable(
-                instance,
-                getNamedWriteableRegistry(),
-                instanceReader(),
-                TransportVersions.V_8_17_0
-            );
-
-            assertEquals(instance, deserializedInstance);
-        }
         {
             // From a version with rerouting removed
             InferenceAction.Request deserializedInstance = copyWriteable(
diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/retriever/RuleQueryRankDoc.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/retriever/RuleQueryRankDoc.java
@@ -9,7 +9,6 @@
 
 import org.apache.lucene.search.Explanation;
 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.RankDoc;
@@ -111,6 +110,6 @@ protected void doToXContent(XContentBuilder builder, Params params) throws IOExc
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_8_17_0;
+        return TransportVersion.minimumCompatible();
     }
 }
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/embeddings/GoogleVertexAiEmbeddingsTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/embeddings/GoogleVertexAiEmbeddingsTaskSettings.java
@@ -95,7 +95,7 @@ public GoogleVertexAiEmbeddingsTaskSettings(@Nullable Boolean autoTruncate, @Nul
 
     public GoogleVertexAiEmbeddingsTaskSettings(StreamInput in) throws IOException {
         this.autoTruncate = in.readOptionalBoolean();
-        var inputType = (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) ? in.readOptionalEnum(InputType.class) : null;
+        var inputType = in.readOptionalEnum(InputType.class);
         validateInputType(inputType);
         this.inputType = inputType;
     }
@@ -134,10 +134,7 @@ public TransportVersion getMinimalSupportedVersion() {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalBoolean(this.autoTruncate);
-
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
-            out.writeOptionalEnum(this.inputType);
-        }
+        out.writeOptionalEnum(this.inputType);
     }
 
     @Override
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/googlevertexai/embeddings/GoogleVertexAiEmbeddingsTaskSettingsTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/googlevertexai/embeddings/GoogleVertexAiEmbeddingsTaskSettingsTests.java
@@ -8,7 +8,6 @@
 package org.elasticsearch.xpack.inference.services.googlevertexai.embeddings;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.ValidationException;
 import org.elasticsearch.common.io.stream.Writeable;
@@ -241,10 +240,6 @@ protected GoogleVertexAiEmbeddingsTaskSettings mutateInstanceForVersion(
         GoogleVertexAiEmbeddingsTaskSettings instance,
         TransportVersion version
     ) {
-        if (version.before(TransportVersions.V_8_17_0)) {
-            // default to null input type if node is on a version before input type was introduced
-            return new GoogleVertexAiEmbeddingsTaskSettings(instance.autoTruncate(), null);
-        }
         return instance;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -427,7 +427,7 @@ public void testTransportVersionsLocked() {`
`427`	`427`	`"TransportVersions.java is locked. Generate transport versions with TransportVersion.fromName "`
`428`	`428`	`+ "and generateTransportVersion gradle task",`
`429`	`429`	`TransportVersions.DEFINED_VERSIONS.getLast().id(),`
`430`		`- equalTo(8_797_0_05)`
	`430`	`+ equalTo(8_772_0_06)`
`431`	`431`	`);`
`432`	`432`	`}`
`433`	`433`	`}`