Small fixes

Author: gmarouli

modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/lifecycle/DataStreamGlobalRetentionIT.java

@@ -67,7 +67,7 @@ public void setup() throws IOException {
         Request createDocRequest = new Request("POST", "/my-data-stream/_doc?refresh=true");
         createDocRequest.setJsonEntity("{ \"@timestamp\": \"2022-12-12\"}");
         assertOK(client().performRequest(createDocRequest));
-        // Index failed doc, this will create the failure store
+        // Index one doc that will fail, this will create the failure store
         createDocRequest = new Request("POST", "/my-data-stream/_doc?refresh=true");
         createDocRequest.setJsonEntity("{ \"@timestamp\": \"2022-12-12\", \"count\": \"not-a-number\"}");
         assertOK(client().performRequest(createDocRequest));

modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/rest/RestGetDataStreamOptionsAction.java

@@ -10,6 +10,7 @@
 
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.client.internal.node.NodeClient;
+import org.elasticsearch.cluster.metadata.DataStreamFailureStore;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.datastreams.options.action.GetDataStreamOptionsAction;
 import org.elasticsearch.rest.BaseRestHandler;
@@ -28,8 +29,7 @@
 @ServerlessScope(Scope.PUBLIC)
 public class RestGetDataStreamOptionsAction extends BaseRestHandler {
 
-    public static final String DATA_STREAM_FAILURE_LIFECYCLE = "failure_lifecycle";
-    private static final Set<String> CAPABILITIES = Set.of(DATA_STREAM_FAILURE_LIFECYCLE);
+    private static final Set<String> CAPABILITIES = Set.of(DataStreamFailureStore.FAILURES_LIFECYCLE_API_CAPABILITY);
 
     @Override
     public String getName() {

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

@@ -12,10 +12,10 @@
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.cluster.metadata.DataStream;
+import org.elasticsearch.cluster.metadata.DataStreamFailureStore;
 import org.elasticsearch.cluster.metadata.DataStreamLifecycle;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.util.set.Sets;
-import org.elasticsearch.datastreams.options.rest.RestGetDataStreamOptionsAction;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.RestUtils;
@@ -52,7 +52,7 @@ public class RestGetDataStreamsAction extends BaseRestHandler {
     );
     private static final Set<String> CAPABILITIES = Stream.of(
         DataStreamLifecycle.EFFECTIVE_RETENTION_REST_API_CAPABILITY,
-        DataStream.isFailureStoreFeatureFlagEnabled() ? RestGetDataStreamOptionsAction.DATA_STREAM_FAILURE_LIFECYCLE : null
+        DataStream.isFailureStoreFeatureFlagEnabled() ? DataStreamFailureStore.FAILURES_LIFECYCLE_API_CAPABILITY : null
     ).filter(Objects::nonNull).collect(Collectors.toSet());
 
     @Override

modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/240_failure_store_info.yml

@@ -5,7 +5,7 @@ setup:
       capabilities:
         - method: GET
           path: /_data_stream/{target}
-          capabilities: [ 'failure_lifecycle' ]
+          capabilities: [ 'failures_lifecycle' ]
   - do:
       allowed_warnings:
         - "index template [my-template1] has index patterns [fs-data-stream] matching patterns from existing older templates [global] with patterns (global => [*]); this template [my-template1] will take precedence during new index creation"

server/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java

@@ -513,7 +513,6 @@ public ClusterState execute(BatchExecutionContext<RolloverTask> batchExecutionCo
                 try (var ignored = taskContext.captureResponseHeaders()) {
                     state = executeTask(state, resultsCollector::appendItem, taskContext, listener);
                 } catch (Exception e) {
-                    logger.warn("Failed to rollover task: {}", taskContext.getTask().rolloverRequest.getRolloverTarget());
                     taskContext.onFailure(e);
                 }
             }

server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java

@@ -527,7 +527,8 @@ public DataStreamLifecycle getDataLifecycle() {
 
     /**
      * Retrieves the effective lifecycle configuration for the failure store. This can be either the configuration provided
-     * by a user or the default lifecycle if there are failure indices.
+     * by a user or the default lifecycle if there are failure indices. NOTE: this does not take into consideration if the
+     * failure store is enabled by a cluster setting, please use {@link DataStream#getFailuresLifecycle(Boolean)}.
      */
     @Nullable
     public DataStreamLifecycle getFailuresLifecycle() {
@@ -538,7 +539,7 @@ public DataStreamLifecycle getFailuresLifecycle() {
 
     /**
      * Retrieves the effective lifecycle configuration for the failure store. This can be either the configuration provided
-     * by a user or the default lifecycle if there are failure indices.
+     * by a user or the default lifecycle if there are failure indices or if the failure store is enabled by a cluster setting.
      */
     @Nullable
     public DataStreamLifecycle getFailuresLifecycle(Boolean effectivelyEnabledFailureStore) {

server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamFailureStore.java

@@ -35,6 +35,7 @@ public record DataStreamFailureStore(@Nullable Boolean enabled, @Nullable DataSt
         SimpleDiffable<DataStreamFailureStore>,
         ToXContentObject {
 
+    public static final String FAILURES_LIFECYCLE_API_CAPABILITY = "failures_lifecycle";
     public static final String FAILURE_STORE = "failure_store";
     public static final String ENABLED = "enabled";
     public static final String LIFECYCLE = "lifecycle";