Remove 7.16 transport version (elastic#124194)

thecoop · georgewallace · commit ced8687efb98 · 2025-03-10T18:59:24.000-06:00
diff --git a/server/src/main/java/org/elasticsearch/ElasticsearchException.java b/server/src/main/java/org/elasticsearch/ElasticsearchException.java
@@ -1842,7 +1842,7 @@ private enum ElasticsearchExceptionHandle {
             org.elasticsearch.ElasticsearchAuthenticationProcessingError.class,
             org.elasticsearch.ElasticsearchAuthenticationProcessingError::new,
             162,
-            TransportVersions.V_7_16_0
+            UNKNOWN_VERSION_ADDED
         ),
         REPOSITORY_CONFLICT_EXCEPTION(
             org.elasticsearch.repositories.RepositoryConflictException.class,
diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java
@@ -62,7 +62,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion V_7_10_0 = def(7_10_00_99);
     public static final TransportVersion V_7_15_0 = def(7_15_00_99);
     public static final TransportVersion V_7_15_1 = def(7_15_01_99);
-    public static final TransportVersion V_7_16_0 = def(7_16_00_99);
     public static final TransportVersion V_7_17_0 = def(7_17_00_99);
     public static final TransportVersion V_7_17_1 = def(7_17_01_99);
     public static final TransportVersion V_7_17_8 = def(7_17_08_99);
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/ShutdownShardMigrationStatus.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ShutdownShardMigrationStatus.java
@@ -9,7 +9,6 @@
 
 package org.elasticsearch.cluster.metadata;
 
-import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.cluster.routing.allocation.ShardAllocationDecision;
 import org.elasticsearch.common.Strings;
@@ -33,7 +32,6 @@
 import static org.elasticsearch.common.xcontent.ChunkedToXContentHelper.startObject;
 
 public class ShutdownShardMigrationStatus implements Writeable, ChunkedToXContentObject {
-    private static final TransportVersion ALLOCATION_DECISION_ADDED_VERSION = TransportVersions.V_7_16_0;
 
     public static final String NODE_ALLOCATION_DECISION_KEY = "node_allocation_decision";
 
@@ -142,11 +140,7 @@ public ShutdownShardMigrationStatus(StreamInput in) throws IOException {
             this.shardsRemaining = in.readLong();
         }
         this.explanation = in.readOptionalString();
-        if (in.getTransportVersion().onOrAfter(ALLOCATION_DECISION_ADDED_VERSION)) {
-            this.allocationDecision = in.readOptionalWriteable(ShardAllocationDecision::new);
-        } else {
-            this.allocationDecision = null;
-        }
+        this.allocationDecision = in.readOptionalWriteable(ShardAllocationDecision::new);
     }
 
     public long getShardsRemaining() {
@@ -203,9 +197,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeLong(shardsRemaining);
         }
         out.writeOptionalString(explanation);
-        if (out.getTransportVersion().onOrAfter(ALLOCATION_DECISION_ADDED_VERSION)) {
-            out.writeOptionalWriteable(allocationDecision);
-        }
+        out.writeOptionalWriteable(allocationDecision);
     }
 
     @Override
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/SingleNodeShutdownMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/SingleNodeShutdownMetadata.java
@@ -36,7 +36,6 @@
  */
 public class SingleNodeShutdownMetadata implements SimpleDiffable<SingleNodeShutdownMetadata>, ToXContentObject {
 
-    public static final TransportVersion REPLACE_SHUTDOWN_TYPE_ADDED_VERSION = TransportVersions.V_7_16_0;
     public static final TransportVersion SIGTERM_ADDED_VERSION = TransportVersions.V_8_9_X;
     public static final TransportVersion GRACE_PERIOD_ADDED_VERSION = TransportVersions.V_8_9_X;
 
@@ -180,11 +179,7 @@ public SingleNodeShutdownMetadata(StreamInput in) throws IOException {
         this.startedAtMillis = in.readVLong();
         this.nodeSeen = in.readBoolean();
         this.allocationDelay = in.readOptionalTimeValue();
-        if (in.getTransportVersion().onOrAfter(REPLACE_SHUTDOWN_TYPE_ADDED_VERSION)) {
-            this.targetNodeName = in.readOptionalString();
-        } else {
-            this.targetNodeName = null;
-        }
+        this.targetNodeName = in.readOptionalString();
         if (in.getTransportVersion().onOrAfter(GRACE_PERIOD_ADDED_VERSION)) {
             this.gracePeriod = in.readOptionalTimeValue();
         } else {
@@ -271,8 +266,7 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getTransportVersion().onOrAfter(NODE_SHUTDOWN_EPHEMERAL_ID_ADDED)) {
             out.writeOptionalString(nodeEphemeralId);
         }
-        if ((out.getTransportVersion().before(REPLACE_SHUTDOWN_TYPE_ADDED_VERSION) && this.type == SingleNodeShutdownMetadata.Type.REPLACE)
-            || (out.getTransportVersion().before(SIGTERM_ADDED_VERSION) && this.type == Type.SIGTERM)) {
+        if (out.getTransportVersion().before(SIGTERM_ADDED_VERSION) && this.type == Type.SIGTERM) {
             out.writeEnum(SingleNodeShutdownMetadata.Type.REMOVE);
         } else {
             out.writeEnum(type);
@@ -281,9 +275,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeVLong(startedAtMillis);
         out.writeBoolean(nodeSeen);
         out.writeOptionalTimeValue(allocationDelay);
-        if (out.getTransportVersion().onOrAfter(REPLACE_SHUTDOWN_TYPE_ADDED_VERSION)) {
-            out.writeOptionalString(targetNodeName);
-        }
+        out.writeOptionalString(targetNodeName);
         if (out.getTransportVersion().onOrAfter(GRACE_PERIOD_ADDED_VERSION)) {
             out.writeOptionalTimeValue(gracePeriod);
         }
diff --git a/server/src/main/java/org/elasticsearch/cluster/service/ClusterStateUpdateStats.java b/server/src/main/java/org/elasticsearch/cluster/service/ClusterStateUpdateStats.java
@@ -9,7 +9,6 @@
 
 package org.elasticsearch.cluster.service;
 
-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;
@@ -118,7 +117,6 @@ public ClusterStateUpdateStats(StreamInput in) throws IOException {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        assert out.getTransportVersion().onOrAfter(TransportVersions.V_7_16_0) : out.getTransportVersion();
         out.writeVLong(unchangedTaskCount);
         out.writeVLong(publicationSuccessCount);
         out.writeVLong(publicationFailureCount);
diff --git a/server/src/main/java/org/elasticsearch/common/document/DocumentField.java b/server/src/main/java/org/elasticsearch/common/document/DocumentField.java
@@ -45,11 +45,7 @@ public class DocumentField implements Writeable, Iterable<Object> {
     public DocumentField(StreamInput in) throws IOException {
         name = in.readString();
         values = in.readCollectionAsList(StreamInput::readGenericValue);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_16_0)) {
-            ignoredValues = in.readCollectionAsList(StreamInput::readGenericValue);
-        } else {
-            ignoredValues = Collections.emptyList();
-        }
+        ignoredValues = in.readCollectionAsList(StreamInput::readGenericValue);
         if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) {
             lookupFields = in.readCollectionAsList(LookupField::new);
         } else {
@@ -115,9 +111,7 @@ public List<Object> getIgnoredValues() {
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(name);
         out.writeCollection(values, StreamOutput::writeGenericValue);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_16_0)) {
-            out.writeCollection(ignoredValues, StreamOutput::writeGenericValue);
-        }
+        out.writeCollection(ignoredValues, StreamOutput::writeGenericValue);
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) {
             out.writeCollection(lookupFields);
         } else {
diff --git a/server/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java b/server/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java
@@ -9,7 +9,6 @@
 
 package org.elasticsearch.discovery;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.cluster.coordination.PendingClusterStateStats;
 import org.elasticsearch.cluster.coordination.PublishClusterStateStats;
 import org.elasticsearch.cluster.service.ClusterApplierRecordingService;
@@ -44,28 +43,16 @@ public DiscoveryStats(
     public DiscoveryStats(StreamInput in) throws IOException {
         queueStats = in.readOptionalWriteable(PendingClusterStateStats::new);
         publishStats = in.readOptionalWriteable(PublishClusterStateStats::new);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_16_0)) {
-            clusterStateUpdateStats = in.readOptionalWriteable(ClusterStateUpdateStats::new);
-        } else {
-            clusterStateUpdateStats = null;
-        }
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_16_0)) {
-            applierRecordingStats = in.readOptionalWriteable(ClusterApplierRecordingService.Stats::new);
-        } else {
-            applierRecordingStats = null;
-        }
+        clusterStateUpdateStats = in.readOptionalWriteable(ClusterStateUpdateStats::new);
+        applierRecordingStats = in.readOptionalWriteable(ClusterApplierRecordingService.Stats::new);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalWriteable(queueStats);
         out.writeOptionalWriteable(publishStats);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_16_0)) {
-            out.writeOptionalWriteable(clusterStateUpdateStats);
-        }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_16_0)) {
-            out.writeOptionalWriteable(applierRecordingStats);
-        }
+        out.writeOptionalWriteable(clusterStateUpdateStats);
+        out.writeOptionalWriteable(applierRecordingStats);
     }
 
     @Override
diff --git a/server/src/main/java/org/elasticsearch/index/store/StoreFileMetadata.java b/server/src/main/java/org/elasticsearch/index/store/StoreFileMetadata.java
@@ -16,8 +16,6 @@
 import org.apache.lucene.index.SegmentInfos;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.Version;
-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;
@@ -31,7 +29,6 @@
 public class StoreFileMetadata implements Writeable {
 
     public static final BytesRef UNAVAILABLE_WRITER_UUID = new BytesRef();
-    private static final TransportVersion WRITER_UUID_MIN_VERSION = TransportVersions.V_7_16_0;
 
     private final String name;
 
@@ -71,11 +68,7 @@ public StoreFileMetadata(StreamInput in) throws IOException {
         checksum = in.readString();
         writtenBy = in.readString();
         hash = in.readBytesRef();
-        if (in.getTransportVersion().onOrAfter(WRITER_UUID_MIN_VERSION)) {
-            writerUuid = StoreFileMetadata.toWriterUuid(in.readBytesRef());
-        } else {
-            writerUuid = UNAVAILABLE_WRITER_UUID;
-        }
+        writerUuid = StoreFileMetadata.toWriterUuid(in.readBytesRef());
     }
 
     @Override
@@ -85,9 +78,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeString(checksum);
         out.writeString(writtenBy);
         out.writeBytesRef(hash);
-        if (out.getTransportVersion().onOrAfter(WRITER_UUID_MIN_VERSION)) {
-            out.writeBytesRef(writerUuid);
-        }
+        out.writeBytesRef(writerUuid);
     }
 
     /**
@@ -196,7 +187,6 @@ public BytesRef hash() {
      * This ID may be {@link StoreFileMetadata#UNAVAILABLE_WRITER_UUID} (i.e. zero-length) if unavailable, e.g.:
      *
      * - The file was written by a version of Lucene prior to 8.6.0.
-     * - The metadata came from a version of Elasticsearch prior to {@link StoreFileMetadata#WRITER_UUID_MIN_VERSION}).
      * - The file is not one of the files listed above.
      *
      */
diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java
@@ -52,7 +52,6 @@ public class RecoverySettings {
     public static final IndexVersion SNAPSHOT_RECOVERIES_SUPPORTED_INDEX_VERSION = IndexVersions.V_7_15_0;
     public static final TransportVersion SNAPSHOT_RECOVERIES_SUPPORTED_TRANSPORT_VERSION = TransportVersions.V_7_15_0;
     public static final IndexVersion SEQ_NO_SNAPSHOT_RECOVERIES_SUPPORTED_VERSION = IndexVersions.V_7_16_0;
-    public static final TransportVersion SNAPSHOT_FILE_DOWNLOAD_THROTTLING_SUPPORTED_TRANSPORT_VERSION = TransportVersions.V_7_16_0;
 
     private static final Logger logger = LogManager.getLogger(RecoverySettings.class);
 
diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java
@@ -52,11 +52,7 @@ public StartRecoveryRequest(StreamInput in) throws IOException {
         metadataSnapshot = Store.MetadataSnapshot.readFrom(in);
         primaryRelocation = in.readBoolean();
         startingSeqNo = in.readLong();
-        if (in.getTransportVersion().onOrAfter(RecoverySettings.SNAPSHOT_FILE_DOWNLOAD_THROTTLING_SUPPORTED_TRANSPORT_VERSION)) {
-            canDownloadSnapshotFiles = in.readBoolean();
-        } else {
-            canDownloadSnapshotFiles = true;
-        }
+        canDownloadSnapshotFiles = in.readBoolean();
     }
 
     /**
@@ -171,9 +167,7 @@ public void writeTo(StreamOutput out) throws IOException {
         metadataSnapshot.writeTo(out);
         out.writeBoolean(primaryRelocation);
         out.writeLong(startingSeqNo);
-        if (out.getTransportVersion().onOrAfter(RecoverySettings.SNAPSHOT_FILE_DOWNLOAD_THROTTLING_SUPPORTED_TRANSPORT_VERSION)) {
-            out.writeBoolean(canDownloadSnapshotFiles);
-        }
+        out.writeBoolean(canDownloadSnapshotFiles);
     }
 
     @Override
diff --git a/server/src/test/java/org/elasticsearch/script/ScriptStatsTests.java b/server/src/test/java/org/elasticsearch/script/ScriptStatsTests.java
@@ -10,7 +10,6 @@
 package org.elasticsearch.script;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -169,38 +168,6 @@ public void testTimeSeriesIsEmpty() {
         assertFalse((new TimeSeries(five, fifteen, day, 0)).areTimingsEmpty());
     }
 
-    public void testTimeSeriesSerialization() throws IOException {
-        ScriptContextStats stats = randomStats();
-
-        ScriptContextStats deserStats = serDeser(TransportVersions.V_8_0_0, TransportVersions.V_7_16_0, stats);
-        // Due to how the versions are handled by TimeSeries serialization, we cannot just simply assert that both object are
-        // equals but not the same
-        assertEquals(stats.getCompilations(), deserStats.getCompilations());
-        assertEquals(stats.getCacheEvictions(), deserStats.getCacheEvictions());
-        assertEquals(stats.getCompilationLimitTriggered(), deserStats.getCompilationLimitTriggered());
-        assertTrue(deserStats.getCompilationsHistory().areTimingsEmpty());
-        assertEquals(stats.getCompilations(), deserStats.getCompilationsHistory().total);
-        assertTrue(deserStats.getCacheEvictionsHistory().areTimingsEmpty());
-        assertEquals(stats.getCacheEvictions(), deserStats.getCacheEvictionsHistory().total);
-
-        deserStats = serDeser(TransportVersions.V_8_0_0, TransportVersions.V_8_0_0, stats);
-        assertNotSame(stats, deserStats);
-        assertEquals(stats, deserStats);
-
-        deserStats = serDeser(TransportVersions.V_8_1_0, TransportVersions.V_7_16_0, stats);
-        // Due to how the versions are handled by TimeSeries serialization, we cannot just simply assert that both object are
-        // equals but not the same
-        assertEquals(stats.getCompilations(), deserStats.getCompilations());
-        assertEquals(stats.getCacheEvictions(), deserStats.getCacheEvictions());
-        assertEquals(stats.getCompilationLimitTriggered(), deserStats.getCompilationLimitTriggered());
-        assertEquals(new TimeSeries(stats.getCompilationsHistory().total), deserStats.getCompilationsHistory());
-        assertEquals(new TimeSeries(stats.getCacheEvictionsHistory().total), deserStats.getCacheEvictionsHistory());
-
-        deserStats = serDeser(TransportVersions.V_8_1_0, TransportVersions.V_8_1_0, stats);
-        assertNotSame(stats, deserStats);
-        assertEquals(stats, deserStats);
-    }
-
     public void testMerge() {
         var first = randomScriptStats();
         var second = randomScriptStats();
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/GetFeatureUsageResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/GetFeatureUsageResponse.java
@@ -48,11 +48,7 @@ public FeatureUsageInfo(
         }
 
         public FeatureUsageInfo(StreamInput in) throws IOException {
-            if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_16_0)) {
-                this.family = in.readOptionalString();
-            } else {
-                this.family = null;
-            }
+            this.family = in.readOptionalString();
             this.name = in.readString();
             this.lastUsedTime = ZonedDateTime.ofInstant(Instant.ofEpochSecond(in.readLong()), ZoneOffset.UTC);
             if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_15_0)) {
@@ -65,9 +61,7 @@ public FeatureUsageInfo(StreamInput in) throws IOException {
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_16_0)) {
-                out.writeOptionalString(this.family);
-            }
+            out.writeOptionalString(this.family);
             out.writeString(name);
             out.writeLong(lastUsedTime.toEpochSecond());
             if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_15_0)) {
diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/aggs/heuristic/PValueScoreTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/aggs/heuristic/PValueScoreTests.java
@@ -34,7 +34,7 @@ public class PValueScoreTests extends AbstractNXYSignificanceHeuristicTestCase {
 
     @Override
     protected TransportVersion randomVersion() {
-        return randomFrom(TransportVersions.V_8_0_0, TransportVersions.V_7_16_0);
+        return randomFrom(TransportVersions.V_8_0_0);
     }
 
     @Override
diff --git a/x-pack/plugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/AbstractSqlQueryRequest.java b/x-pack/plugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/AbstractSqlQueryRequest.java
@@ -429,9 +429,7 @@ public AbstractSqlQueryRequest(StreamInput in) throws IOException {
         query = in.readString();
         params = in.readCollectionAsList(AbstractSqlQueryRequest::readSqlTypedParamValue);
         zoneId = in.readZoneId();
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_16_0)) {
-            catalog = in.readOptionalString();
-        }
+        catalog = in.readOptionalString();
         fetchSize = in.readVInt();
         requestTimeout = in.readTimeValue();
         pageTimeout = in.readTimeValue();
@@ -455,9 +453,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeString(query);
         out.writeCollection(params, AbstractSqlQueryRequest::writeSqlTypedParamValue);
         out.writeZoneId(zoneId);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_16_0)) {
-            out.writeOptionalString(catalog);
-        }
+        out.writeOptionalString(catalog);
         out.writeVInt(fetchSize);
         out.writeTimeValue(requestTimeout);
         out.writeTimeValue(pageTimeout);
