Merge remote-tracking branch 'origin/main' into ankikuma-09162025/ReshardSplitRequestOnSourceTwoPass

Author: Tim-Brooks

modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/MatrixStatsAggregationBuilder.java

@@ -9,7 +9,6 @@
 package org.elasticsearch.aggregations.metric;
 
 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.MultiValueMode;
@@ -57,16 +56,12 @@ public boolean supportsSampling() {
      */
     public MatrixStatsAggregationBuilder(StreamInput in) throws IOException {
         super(in);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) {
-            multiValueMode = MultiValueMode.readMultiValueModeFrom(in);
-        }
+        multiValueMode = MultiValueMode.readMultiValueModeFrom(in);
     }
 
     @Override
     protected void innerWriteTo(StreamOutput out) throws IOException {
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) {
-            multiValueMode.writeTo(out);
-        }
+        multiValueMode.writeTo(out);
     }
 
     public MatrixStatsAggregationBuilder multiValueMode(MultiValueMode multiValueMode) {

muted-tests.yml

@@ -627,9 +627,6 @@ tests:
 - class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
   method: test {csv-spec:string.SpaceNegative}
   issue: https://github.com/elastic/elasticsearch/issues/136249
-- class: org.elasticsearch.health.node.ShardsCapacityHealthIndicatorServiceStatelessTests
-  method: testIndicatorYieldsGreenInCaseThereIsRoom
-  issue: https://github.com/elastic/elasticsearch/issues/136303
 - class: org.elasticsearch.index.store.AsyncDirectIODirectoryTests
   method: testIsLoadedOnSlice
   issue: https://github.com/elastic/elasticsearch/issues/136331

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

@@ -61,10 +61,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion V_7_9_0 = def(7_09_00_99);
     public static final TransportVersion V_7_10_0 = def(7_10_00_99);
     public static final TransportVersion V_8_0_0 = def(8_00_00_99);
-    public static final TransportVersion V_8_6_0 = def(8_06_00_99);
-    public static final TransportVersion V_8_6_1 = def(8_06_01_99);
-    public static final TransportVersion V_8_7_0 = def(8_07_00_99);
-    public static final TransportVersion V_8_7_1 = def(8_07_01_99);
     public static final TransportVersion V_8_8_0 = def(8_08_00_99);
     public static final TransportVersion V_8_8_1 = def(8_08_01_99);
     /*
@@ -82,7 +78,6 @@ static TransportVersion def(int id) {
     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);
-    public static final TransportVersion V_8_16_1 = def(8_772_0_04);
     // 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);
 

server/src/main/java/org/elasticsearch/action/RoutingMissingException.java

@@ -10,10 +10,8 @@
 package org.elasticsearch.action;
 
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.rest.RestStatus;
 
 import java.io.IOException;
@@ -42,18 +40,12 @@ public RestStatus status() {
 
     public RoutingMissingException(StreamInput in) throws IOException {
         super(in);
-        if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) {
-            in.readString();
-        }
         id = in.readString();
     }
 
     @Override
     protected void writeTo(StreamOutput out, Writer<Throwable> nestedExceptionsWriter) throws IOException {
         super.writeTo(out, nestedExceptionsWriter);
-        if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) {
-            out.writeString(MapperService.SINGLE_MAPPING_NAME);
-        }
         out.writeString(id);
     }
 }

server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java

@@ -66,11 +66,7 @@ public NodeInfo(StreamInput in) throws IOException {
         super(in);
         if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
             version = in.readString();
-            if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) {
-                compatibilityVersions = CompatibilityVersions.readVersion(in);
-            } else {
-                compatibilityVersions = new CompatibilityVersions(TransportVersion.readVersion(in), Map.of()); // unknown mappings versions
-            }
+            compatibilityVersions = CompatibilityVersions.readVersion(in);
             indexVersion = IndexVersion.readVersion(in);
         } else {
             Version legacyVersion = Version.readVersion(in);
@@ -251,11 +247,7 @@ public void writeTo(StreamOutput out) throws IOException {
         } else {
             Version.writeVersion(Version.fromString(version), out);
         }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) {
-            compatibilityVersions.writeTo(out);
-        } else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
-            TransportVersion.writeVersion(compatibilityVersions.transportVersion(), out);
-        }
+        compatibilityVersions.writeTo(out);
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
             IndexVersion.writeVersion(indexVersion, out);
             out.writeMap(componentVersions, StreamOutput::writeString, StreamOutput::writeVInt);

server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesRemovalPrevalidation.java

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.action.admin.cluster.node.shutdown;
 
-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;
@@ -149,16 +148,11 @@ static <T> void configureParser(ConstructingObjectParser<T, Void> parser) {
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             out.writeBoolean(isSafe);
-            if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) {
-                reason.writeTo(out);
-            }
+            reason.writeTo(out);
             out.writeString(message);
         }
 
         public static Result readFrom(final StreamInput in) throws IOException {
-            if (in.getTransportVersion().before(TransportVersions.V_8_7_0)) {
-                return new Result(in.readBoolean(), null, in.readString());
-            }
             return new Result(in.readBoolean(), Reason.readFrom(in), in.readString());
         }
 

server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequest.java

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.action.admin.cluster.node.shutdown;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.master.MasterNodeReadRequest;
 import org.elasticsearch.common.Strings;
@@ -46,9 +45,7 @@ public PrevalidateNodeRemovalRequest(final StreamInput in) throws IOException {
         names = in.readStringArray();
         ids = in.readStringArray();
         externalIds = in.readStringArray();
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) {
-            timeout = in.readTimeValue();
-        }
+        timeout = in.readTimeValue();
     }
 
     @Override
@@ -57,9 +54,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeStringArray(names);
         out.writeStringArray(ids);
         out.writeStringArray(externalIds);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) {
-            out.writeTimeValue(timeout);
-        }
+        out.writeTimeValue(timeout);
     }
 
     @Override

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

@@ -40,11 +40,7 @@ public ClusterStatsNodeResponse(StreamInput in) throws IOException {
         this.nodeInfo = new NodeInfo(in);
         this.nodeStats = new NodeStats(in);
         this.shardsStats = in.readArray(ShardStats::new, ShardStats[]::new);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) {
-            searchUsageStats = new SearchUsageStats(in);
-        } else {
-            searchUsageStats = new SearchUsageStats();
-        }
+        searchUsageStats = new SearchUsageStats(in);
         if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
             repositoryUsageStats = RepositoryUsageStats.readFrom(in);
             searchCcsMetrics = new CCSTelemetrySnapshot(in);
@@ -120,9 +116,7 @@ public void writeTo(StreamOutput out) throws IOException {
         nodeInfo.writeTo(out);
         nodeStats.writeTo(out);
         out.writeArray(shardsStats);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) {
-            searchUsageStats.writeTo(out);
-        }
+        searchUsageStats.writeTo(out);
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
             repositoryUsageStats.writeTo(out);
             searchCcsMetrics.writeTo(out);

server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.action.admin.indices.get;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
@@ -113,9 +112,6 @@ public GetIndexRequest(TimeValue masterTimeout) {
     public GetIndexRequest(StreamInput in) throws IOException {
         super(in);
         indices = in.readStringArray();
-        if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) {
-            in.readStringArray();
-        }
         indicesOptions = IndicesOptions.readIndicesOptions(in);
         features = in.readArray(i -> Feature.fromId(i.readByte()), Feature[]::new);
         humanReadable = in.readBoolean();

server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.action.admin.indices.get;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.cluster.metadata.AliasMetadata;
 import org.elasticsearch.cluster.metadata.MappingMetadata;
@@ -20,7 +19,6 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.ChunkedToXContentObject;
 import org.elasticsearch.core.UpdateForV10;
-import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.xcontent.ToXContent;
 
 import java.io.IOException;
@@ -77,18 +75,10 @@ public GetIndexResponse(
     @UpdateForV10(owner = UpdateForV10.Owner.DATA_MANAGEMENT)
     GetIndexResponse(StreamInput in) throws IOException {
         this.indices = in.readStringArray();
-        mappings = in.readImmutableOpenMap(StreamInput::readString, in.getTransportVersion().before(TransportVersions.V_8_0_0) ? i -> {
-            int numMappings = i.readVInt();
-            assert numMappings == 0 || numMappings == 1 : "Expected 0 or 1 mappings but got " + numMappings;
-            if (numMappings == 1) {
-                String type = i.readString();
-                assert MapperService.SINGLE_MAPPING_NAME.equals(type) : "Expected [_doc] but got [" + type + "]";
-                return new MappingMetadata(i);
-            } else {
-                return MappingMetadata.EMPTY_MAPPINGS;
-            }
-        } : i -> i.readBoolean() ? new MappingMetadata(i) : MappingMetadata.EMPTY_MAPPINGS);
-
+        mappings = in.readImmutableOpenMap(
+            StreamInput::readString,
+            i -> i.readBoolean() ? new MappingMetadata(i) : MappingMetadata.EMPTY_MAPPINGS
+        );
         aliases = in.readImmutableOpenMap(StreamInput::readString, i -> i.readCollectionAsList(AliasMetadata::new));
         settings = in.readImmutableOpenMap(StreamInput::readString, Settings::readSettingsFromStream);
         defaultSettings = in.readImmutableOpenMap(StreamInput::readString, Settings::readSettingsFromStream);