Remove last references to flag and flag itself

jbaiera · jbaiera · commit 40fe4c04079a · 2025-04-16T15:23:27.000-04:00
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java
@@ -33,7 +33,6 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.time.DateFormatter;
 import org.elasticsearch.common.time.DateFormatters;
-import org.elasticsearch.common.util.FeatureFlag;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.TimeValue;
@@ -75,15 +74,10 @@ public final class DataStream implements SimpleDiffable<DataStream>, ToXContentO
 
     private static final Logger LOGGER = LogManager.getLogger(DataStream.class);
 
-    public static final boolean FAILURE_STORE_FEATURE_FLAG = new FeatureFlag("failure_store").isEnabled();
     public static final TransportVersion ADDED_FAILURE_STORE_TRANSPORT_VERSION = TransportVersions.V_8_12_0;
     public static final TransportVersion ADDED_AUTO_SHARDING_EVENT_VERSION = TransportVersions.V_8_14_0;
     public static final TransportVersion ADD_DATA_STREAM_OPTIONS_VERSION = TransportVersions.V_8_16_0;
 
-    public static boolean isFailureStoreFeatureFlagEnabled() {
-        return FAILURE_STORE_FEATURE_FLAG;
-    }
-
     public static final String BACKING_INDEX_PREFIX = ".ds-";
     public static final String FAILURE_STORE_PREFIX = ".fs-";
     public static final DateFormatter DATE_FORMATTER = DateFormatter.forPattern("uuuu.MM.dd");
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java
@@ -11,7 +11,6 @@
 
 import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
 import org.elasticsearch.client.internal.node.NodeClient;
-import org.elasticsearch.cluster.metadata.DataStream;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
@@ -80,6 +79,6 @@ public boolean canTripCircuitBreaker() {
 
     @Override
     public Set<String> supportedCapabilities() {
-        return DataStream.isFailureStoreFeatureFlagEnabled() ? Set.of(DATA_STREAM_FAILURE_STORE_CLUSTER_SETTING_CAPABILITY) : Set.of();
+        return Set.of(DATA_STREAM_FAILURE_STORE_CLUSTER_SETTING_CAPABILITY);
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutComponentTemplateAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutComponentTemplateAction.java
@@ -12,7 +12,6 @@
 import org.elasticsearch.action.admin.indices.template.put.PutComponentTemplateAction;
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.cluster.metadata.ComponentTemplate;
-import org.elasticsearch.cluster.metadata.DataStream;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.Scope;
@@ -59,6 +58,6 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
 
     @Override
     public Set<String> supportedCapabilities() {
-        return DataStream.isFailureStoreFeatureFlagEnabled() ? capabilities : Set.of();
+        return capabilities;
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutComposableIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutComposableIndexTemplateAction.java
@@ -12,7 +12,6 @@
 import org.elasticsearch.action.admin.indices.template.put.TransportPutComposableIndexTemplateAction;
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
-import org.elasticsearch.cluster.metadata.DataStream;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.Scope;
@@ -61,6 +60,6 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
 
     @Override
     public Set<String> supportedCapabilities() {
-        return DataStream.isFailureStoreFeatureFlagEnabled() ? capabilities : Set.of();
+        return capabilities;
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java
@@ -12,7 +12,6 @@
 import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
 import org.elasticsearch.action.support.ActiveShardCount;
 import org.elasticsearch.client.internal.node.NodeClient;
-import org.elasticsearch.cluster.metadata.DataStream;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.Scope;
@@ -43,11 +42,7 @@ public String getName() {
 
     @Override
     public Set<String> supportedCapabilities() {
-        if (DataStream.isFailureStoreFeatureFlagEnabled()) {
-            return Set.of("return-404-on-missing-target", "lazy-rollover-failure-store", "index-expression-selectors");
-        } else {
-            return Set.of("return-404-on-missing-target");
-        }
+        return Set.of("return-404-on-missing-target", "lazy-rollover-failure-store", "index-expression-selectors");
     }
 
     @Override
diff --git a/server/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java
@@ -18,7 +18,6 @@
 import org.elasticsearch.action.bulk.IncrementalBulkService;
 import org.elasticsearch.action.support.ActiveShardCount;
 import org.elasticsearch.client.internal.node.NodeClient;
-import org.elasticsearch.cluster.metadata.DataStream;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.bytes.CompositeBytesReference;
 import org.elasticsearch.common.bytes.ReleasableBytesReference;
@@ -69,7 +68,7 @@ public class RestBulkAction extends BaseRestHandler {
     public RestBulkAction(Settings settings, IncrementalBulkService bulkHandler) {
         this.allowExplicitIndex = MULTI_ALLOW_EXPLICIT_INDEX.get(settings);
         this.bulkHandler = bulkHandler;
-        this.capabilities = DataStream.isFailureStoreFeatureFlagEnabled() ? Set.of(FAILURE_STORE_STATUS_CAPABILITY) : Set.of();
+        this.capabilities = Set.of(FAILURE_STORE_STATUS_CAPABILITY);
     }
 
     @Override
diff --git a/server/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java
@@ -15,7 +15,6 @@
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.support.ActiveShardCount;
 import org.elasticsearch.client.internal.node.NodeClient;
-import org.elasticsearch.cluster.metadata.DataStream;
 import org.elasticsearch.common.bytes.ReleasableBytesReference;
 import org.elasticsearch.index.VersionType;
 import org.elasticsearch.rest.BaseRestHandler;
@@ -40,9 +39,7 @@ public class RestIndexAction extends BaseRestHandler {
     static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in document "
         + "index requests is deprecated, use the typeless endpoints instead (/{index}/_doc/{id}, /{index}/_doc, "
         + "or /{index}/_create/{id}).";
-    private final Set<String> capabilities = DataStream.isFailureStoreFeatureFlagEnabled()
-        ? Set.of(FAILURE_STORE_STATUS_CAPABILITY)
-        : Set.of();
+    private final Set<String> capabilities = Set.of(FAILURE_STORE_STATUS_CAPABILITY);
 
     @Override
     public List<Route> routes() {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;`
`13`	`13`	`import org.elasticsearch.client.internal.node.NodeClient;`
`14`		`-import org.elasticsearch.cluster.metadata.DataStream;`
`15`	`14`	`import org.elasticsearch.common.settings.Settings;`
`16`	`15`	`import org.elasticsearch.rest.BaseRestHandler;`
`17`	`16`	`import org.elasticsearch.rest.RestRequest;`
`@@ -80,6 +79,6 @@ public boolean canTripCircuitBreaker() {`
`80`	`79`
`81`	`80`	`@Override`
`82`	`81`	`public Set<String> supportedCapabilities() {`
`83`		`- return DataStream.isFailureStoreFeatureFlagEnabled() ? Set.of(DATA_STREAM_FAILURE_STORE_CLUSTER_SETTING_CAPABILITY) : Set.of();`
	`82`	`+ return Set.of(DATA_STREAM_FAILURE_STORE_CLUSTER_SETTING_CAPABILITY);`
`84`	`83`	`}`
`85`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`import org.elasticsearch.action.admin.indices.template.put.PutComponentTemplateAction;`
`13`	`13`	`import org.elasticsearch.client.internal.node.NodeClient;`
`14`	`14`	`import org.elasticsearch.cluster.metadata.ComponentTemplate;`
`15`		`-import org.elasticsearch.cluster.metadata.DataStream;`
`16`	`15`	`import org.elasticsearch.rest.BaseRestHandler;`
`17`	`16`	`import org.elasticsearch.rest.RestRequest;`
`18`	`17`	`import org.elasticsearch.rest.Scope;`
`@@ -59,6 +58,6 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC`
`59`	`58`
`60`	`59`	`@Override`
`61`	`60`	`public Set<String> supportedCapabilities() {`
`62`		`- return DataStream.isFailureStoreFeatureFlagEnabled() ? capabilities : Set.of();`
	`61`	`+ return capabilities;`
`63`	`62`	`}`
`64`	`63`	`}`