Remove some historical features (#116926)

Historical features are now trivially true on v9 - so we can remove the features, and the check.
Historical features do not affect cluster state, so this has no compatibility restrictions.

Author: thecoop

modules/data-streams/src/main/java/org/elasticsearch/datastreams/DataStreamFeatures.java

@@ -9,30 +9,22 @@
 
 package org.elasticsearch.datastreams;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.indices.rollover.LazyRolloverAction;
 import org.elasticsearch.action.datastreams.autosharding.DataStreamAutoShardingService;
 import org.elasticsearch.cluster.metadata.DataStreamGlobalRetention;
 import org.elasticsearch.datastreams.lifecycle.health.DataStreamLifecycleHealthInfoPublisher;
 import org.elasticsearch.features.FeatureSpecification;
 import org.elasticsearch.features.NodeFeature;
 
-import java.util.Map;
 import java.util.Set;
 
 /**
  * Provides the features for data streams that this version of the code supports
  */
 public class DataStreamFeatures implements FeatureSpecification {
 
-    public static final NodeFeature DATA_STREAM_LIFECYCLE = new NodeFeature("data_stream.lifecycle");
     public static final NodeFeature DATA_STREAM_FAILURE_STORE_TSDB_FIX = new NodeFeature("data_stream.failure_store.tsdb_fix");
 
-    @Override
-    public Map<NodeFeature, Version> getHistoricalFeatures() {
-        return Map.of(DATA_STREAM_LIFECYCLE, Version.V_8_11_0);
-    }
-
     @Override
     public Set<NodeFeature> getFeatures() {
         return Set.of(

server/src/main/java/module-info.java

@@ -426,7 +426,6 @@
             org.elasticsearch.cluster.service.TransportFeatures,
             org.elasticsearch.cluster.metadata.MetadataFeatures,
             org.elasticsearch.rest.RestFeatures,
-            org.elasticsearch.indices.IndicesFeatures,
             org.elasticsearch.repositories.RepositoriesFeatures,
             org.elasticsearch.action.admin.cluster.allocation.AllocationStatsFeatures,
             org.elasticsearch.rest.action.admin.cluster.ClusterRerouteFeatures,

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

@@ -853,7 +853,7 @@ public void initRestHandlers(Supplier<DiscoveryNodes> nodesInCluster, Predicate<
         registerHandler.accept(new RestClusterStateAction(settingsFilter, threadPool));
         registerHandler.accept(new RestClusterHealthAction());
         registerHandler.accept(new RestClusterUpdateSettingsAction());
-        registerHandler.accept(new RestClusterGetSettingsAction(settings, clusterSettings, settingsFilter, clusterSupportsFeature));
+        registerHandler.accept(new RestClusterGetSettingsAction(settings, clusterSettings, settingsFilter));
         registerHandler.accept(new RestClusterRerouteAction(settingsFilter));
         registerHandler.accept(new RestClusterSearchShardsAction());
         registerHandler.accept(new RestPendingClusterTasksAction());

server/src/main/java/org/elasticsearch/indices/IndicesFeatures.java

@@ -23,7 +23,6 @@
 import org.elasticsearch.action.ResolvedIndices;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.action.admin.indices.mapping.put.TransportAutoPutMappingAction;
-import org.elasticsearch.action.admin.indices.mapping.put.TransportPutMappingAction;
 import org.elasticsearch.action.admin.indices.stats.CommonStats;
 import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags;
 import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags.Flag;
@@ -79,7 +78,6 @@
 import org.elasticsearch.env.ShardLock;
 import org.elasticsearch.env.ShardLockObtainFailedException;
 import org.elasticsearch.features.FeatureService;
-import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.gateway.MetaStateService;
 import org.elasticsearch.gateway.MetadataStateFormat;
 import org.elasticsearch.index.CloseUtils;
@@ -211,8 +209,6 @@ public class IndicesService extends AbstractLifecycleComponent
         Setting.Property.NodeScope
     );
 
-    static final NodeFeature SUPPORTS_AUTO_PUT = new NodeFeature("indices.auto_put_supported");
-
     /**
      * The node's settings.
      */
@@ -910,9 +906,7 @@ public void createShard(
                     .setConcreteIndex(shardRouting.index())
                     .source(mapping.source().string(), XContentType.JSON);
                 client.execute(
-                    featureService.clusterHasFeature(clusterService.state(), SUPPORTS_AUTO_PUT)
-                        ? TransportAutoPutMappingAction.TYPE
-                        : TransportPutMappingAction.TYPE,
+                    TransportAutoPutMappingAction.TYPE,
                     putMappingRequestAcknowledgedRequest.ackTimeout(TimeValue.MAX_VALUE).masterNodeTimeout(TimeValue.MAX_VALUE),
                     new RefCountAwareThreadedActionListener<>(threadPool.generic(), listener.map(ignored -> null))
                 );

server/src/main/java/org/elasticsearch/indices/IndicesService.java

@@ -9,13 +9,10 @@
 
 package org.elasticsearch.rest;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.features.FeatureSpecification;
 import org.elasticsearch.features.NodeFeature;
-import org.elasticsearch.rest.action.admin.cluster.RestClusterGetSettingsAction;
 import org.elasticsearch.rest.action.admin.cluster.RestNodesCapabilitiesAction;
 
-import java.util.Map;
 import java.util.Set;
 
 import static org.elasticsearch.search.fetch.subphase.highlight.DefaultHighlighter.UNIFIED_HIGHLIGHTER_MATCHED_FIELDS;
@@ -29,9 +26,4 @@ public Set<NodeFeature> getFeatures() {
             UNIFIED_HIGHLIGHTER_MATCHED_FIELDS
         );
     }
-
-    @Override
-    public Map<NodeFeature, Version> getHistoricalFeatures() {
-        return Map.of(RestClusterGetSettingsAction.SUPPORTS_GET_SETTINGS_ACTION, Version.V_8_3_0);
-    }
 }

server/src/main/java/org/elasticsearch/rest/RestFeatures.java

@@ -11,13 +11,11 @@
 
 import org.elasticsearch.action.admin.cluster.settings.ClusterGetSettingsAction;
 import org.elasticsearch.action.admin.cluster.settings.RestClusterGetSettingsResponse;
-import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
 import org.elasticsearch.action.support.master.MasterNodeReadRequest;
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.common.settings.ClusterSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsFilter;
-import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.Scope;
@@ -27,31 +25,21 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Set;
-import java.util.function.Predicate;
 
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestUtils.getMasterNodeTimeout;
 
 @ServerlessScope(Scope.INTERNAL)
 public class RestClusterGetSettingsAction extends BaseRestHandler {
 
-    public static final NodeFeature SUPPORTS_GET_SETTINGS_ACTION = new NodeFeature("rest.get_settings_action");
-
     private final Settings settings;
     private final ClusterSettings clusterSettings;
     private final SettingsFilter settingsFilter;
-    private final Predicate<NodeFeature> clusterSupportsFeature;
 
-    public RestClusterGetSettingsAction(
-        Settings settings,
-        ClusterSettings clusterSettings,
-        SettingsFilter settingsFilter,
-        Predicate<NodeFeature> clusterSupportsFeature
-    ) {
+    public RestClusterGetSettingsAction(Settings settings, ClusterSettings clusterSettings, SettingsFilter settingsFilter) {
         this.settings = settings;
         this.clusterSettings = clusterSettings;
         this.settingsFilter = settingsFilter;
-        this.clusterSupportsFeature = clusterSupportsFeature;
     }
 
     @Override
@@ -72,10 +60,6 @@ private static void setUpRequestParams(MasterNodeReadRequest<?> clusterRequest,
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
         final boolean renderDefaults = request.paramAsBoolean("include_defaults", false);
 
-        if (clusterSupportsFeature.test(SUPPORTS_GET_SETTINGS_ACTION) == false) {
-            return prepareLegacyRequest(request, client, renderDefaults);
-        }
-
         ClusterGetSettingsAction.Request clusterSettingsRequest = new ClusterGetSettingsAction.Request(getMasterNodeTimeout(request));
 
         setUpRequestParams(clusterSettingsRequest, request);
@@ -89,29 +73,6 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
         );
     }
 
-    private RestChannelConsumer prepareLegacyRequest(final RestRequest request, final NodeClient client, final boolean renderDefaults) {
-        ClusterStateRequest clusterStateRequest = new ClusterStateRequest(getMasterNodeTimeout(request)).routingTable(false).nodes(false);
-        setUpRequestParams(clusterStateRequest, request);
-        return channel -> client.admin()
-            .cluster()
-            .state(
-                clusterStateRequest,
-                new RestToXContentListener<RestClusterGetSettingsResponse>(channel).map(
-                    r -> response(
-                        new ClusterGetSettingsAction.Response(
-                            r.getState().metadata().persistentSettings(),
-                            r.getState().metadata().transientSettings(),
-                            r.getState().metadata().settings()
-                        ),
-                        renderDefaults,
-                        settingsFilter,
-                        clusterSettings,
-                        settings
-                    )
-                )
-            );
-    }
-
     @Override
     protected Set<String> responseParams() {
         return Settings.FORMAT_PARAMS;

server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java

@@ -14,7 +14,6 @@ org.elasticsearch.health.HealthFeatures
 org.elasticsearch.cluster.service.TransportFeatures
 org.elasticsearch.cluster.metadata.MetadataFeatures
 org.elasticsearch.rest.RestFeatures
-org.elasticsearch.indices.IndicesFeatures
 org.elasticsearch.repositories.RepositoriesFeatures
 org.elasticsearch.action.admin.cluster.allocation.AllocationStatsFeatures
 org.elasticsearch.rest.action.admin.cluster.ClusterRerouteFeatures

server/src/main/resources/META-INF/services/org.elasticsearch.features.FeatureSpecification

@@ -146,7 +146,6 @@
 import org.elasticsearch.index.seqno.RetentionLeaseSyncer;
 import org.elasticsearch.index.shard.PrimaryReplicaSyncer;
 import org.elasticsearch.indices.EmptySystemIndices;
-import org.elasticsearch.indices.IndicesFeatures;
 import org.elasticsearch.indices.IndicesModule;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.indices.IndicesServiceBuilder;
@@ -2245,7 +2244,7 @@ public RecyclerBytesStreamOutput newNetworkBytesStream() {
                     .scriptService(scriptService)
                     .clusterService(clusterService)
                     .client(client)
-                    .featureService(new FeatureService(List.of(new IndicesFeatures())))
+                    .featureService(new FeatureService(List.of()))
                     .metaStateService(new MetaStateService(nodeEnv, namedXContentRegistry))
                     .mapperMetrics(MapperMetrics.NOOP)
                     .build();

server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java

@@ -10,7 +10,6 @@
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.features.FeatureService;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.xcontent.NamedXContentRegistry;
 import org.elasticsearch.xpack.core.ClientHelper;
@@ -33,16 +32,14 @@ public APMIndexTemplateRegistry(
         ClusterService clusterService,
         ThreadPool threadPool,
         Client client,
-        NamedXContentRegistry xContentRegistry,
-        FeatureService featureService
+        NamedXContentRegistry xContentRegistry
     ) {
         super(
             nodeSettings,
             clusterService,
             threadPool,
             client,
             xContentRegistry,
-            featureService,
             templateFilter(isDataStreamsLifecycleOnlyMode(clusterService.getSettings()))
         );
     }