Dlm add auto rollover condition max age

docs/changelog/94950.yaml

@@ -0,0 +1,5 @@
+pr: 94950
+summary: Dlm add auto rollover condition max age
+area: DLM
+type: feature
+issues: []

modules/dlm/src/internalClusterTest/java/org/elasticsearch/dlm/CrudDataLifecycleIT.java

@@ -67,7 +67,7 @@ public void testGetLifecycle() throws Exception {
             assertThat(response.getDataStreamLifecycles().get(0).lifecycle(), equalTo(lifecycle));
             assertThat(response.getDataStreamLifecycles().get(1).dataStreamName(), equalTo("with-lifecycle-2"));
             assertThat(response.getDataStreamLifecycles().get(1).lifecycle(), equalTo(lifecycle));
-            assertThat(response.getRolloverConditions(), nullValue());
+            assertThat(response.getRolloverConfiguration(), nullValue());
         }
 
         // Test retrieving all lifecycles prefixed wildcard
@@ -79,7 +79,7 @@ public void testGetLifecycle() throws Exception {
             assertThat(response.getDataStreamLifecycles().get(0).lifecycle(), equalTo(lifecycle));
             assertThat(response.getDataStreamLifecycles().get(1).dataStreamName(), equalTo("with-lifecycle-2"));
             assertThat(response.getDataStreamLifecycles().get(1).lifecycle(), equalTo(lifecycle));
-            assertThat(response.getRolloverConditions(), nullValue());
+            assertThat(response.getRolloverConfiguration(), nullValue());
         }
 
         // Test retrieving concrete data streams
@@ -91,7 +91,7 @@ public void testGetLifecycle() throws Exception {
             assertThat(response.getDataStreamLifecycles().size(), equalTo(2));
             assertThat(response.getDataStreamLifecycles().get(0).dataStreamName(), equalTo("with-lifecycle-1"));
             assertThat(response.getDataStreamLifecycles().get(0).lifecycle(), equalTo(lifecycle));
-            assertThat(response.getRolloverConditions(), nullValue());
+            assertThat(response.getRolloverConfiguration(), nullValue());
         }
 
         // Test include defaults
@@ -106,7 +106,7 @@ public void testGetLifecycle() throws Exception {
         assertThat(responseWithRollover.getDataStreamLifecycles().get(0).lifecycle(), equalTo(lifecycle));
         assertThat(responseWithRollover.getDataStreamLifecycles().get(1).dataStreamName(), equalTo("with-lifecycle-2"));
         assertThat(responseWithRollover.getDataStreamLifecycles().get(1).lifecycle(), equalTo(lifecycle));
-        assertThat(responseWithRollover.getRolloverConditions(), notNullValue());
+        assertThat(responseWithRollover.getRolloverConfiguration(), notNullValue());
     }
 
     public void testPutLifecycle() throws Exception {

modules/dlm/src/internalClusterTest/java/org/elasticsearch/dlm/ExplainDataLifecycleIT.java

@@ -11,6 +11,7 @@
 import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
 import org.elasticsearch.action.admin.indices.rollover.Condition;
 import org.elasticsearch.action.admin.indices.rollover.RolloverConditions;
+import org.elasticsearch.action.admin.indices.rollover.RolloverConfiguration;
 import org.elasticsearch.action.admin.indices.template.put.PutComposableIndexTemplateAction;
 import org.elasticsearch.action.bulk.BulkItemResponse;
 import org.elasticsearch.action.bulk.BulkRequest;
@@ -113,7 +114,7 @@ public void testExplainLifecycle() throws Exception {
                 .actionGet();
             assertThat(response.getIndices().size(), is(2));
             // we requested the explain for indices with the default include_details=false
-            assertThat(response.getRolloverConditions(), nullValue());
+            assertThat(response.getRolloverConfiguration(), nullValue());
             for (ExplainIndexDataLifecycle explainIndex : response.getIndices()) {
                 assertThat(explainIndex.isManagedByDLM(), is(true));
                 assertThat(explainIndex.getIndexCreationDate(), notNullValue());
@@ -148,9 +149,9 @@ public void testExplainLifecycle() throws Exception {
             ExplainDataLifecycleAction.Response response = client().execute(ExplainDataLifecycleAction.INSTANCE, explainIndicesRequest)
                 .actionGet();
             assertThat(response.getIndices().size(), is(2));
-            RolloverConditions rolloverConditions = response.getRolloverConditions();
-            assertThat(rolloverConditions, notNullValue());
-            Map<String, Condition<?>> conditions = rolloverConditions.getConditions();
+            RolloverConfiguration rolloverConfiguration = response.getRolloverConfiguration();
+            assertThat(rolloverConfiguration, notNullValue());
+            Map<String, Condition<?>> conditions = rolloverConfiguration.resolveRolloverConditions(null).getConditions();
             assertThat(conditions.size(), is(2));
             assertThat(conditions.get(RolloverConditions.MAX_DOCS_FIELD.getPreferredName()).value(), is(1L));
             assertThat(conditions.get(RolloverConditions.MIN_DOCS_FIELD.getPreferredName()).value(), is(1L));
@@ -198,7 +199,7 @@ public void testExplainLifecycleForIndicesWithErrors() throws Exception {
                 .actionGet();
             assertThat(response.getIndices().size(), is(1));
             // we requested the explain for indices with the default include_details=false
-            assertThat(response.getRolloverConditions(), nullValue());
+            assertThat(response.getRolloverConfiguration(), nullValue());
             for (ExplainIndexDataLifecycle explainIndex : response.getIndices()) {
                 assertThat(explainIndex.getIndex(), is(writeIndexName));
                 assertThat(explainIndex.isManagedByDLM(), is(true));
@@ -244,7 +245,7 @@ public void testExplainDLMForUnmanagedIndices() throws Exception {
             ExplainDataLifecycleAction.Response response = client().execute(ExplainDataLifecycleAction.INSTANCE, explainIndicesRequest)
                 .actionGet();
             assertThat(response.getIndices().size(), is(1));
-            assertThat(response.getRolloverConditions(), nullValue());
+            assertThat(response.getRolloverConfiguration(), nullValue());
             for (ExplainIndexDataLifecycle explainIndex : response.getIndices()) {
                 assertThat(explainIndex.isManagedByDLM(), is(false));
                 assertThat(explainIndex.getIndex(), is(writeIndexName));

modules/dlm/src/main/java/org/elasticsearch/dlm/DataLifecycleService.java

@@ -14,7 +14,7 @@
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ResultDeduplicator;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
-import org.elasticsearch.action.admin.indices.rollover.RolloverConditions;
+import org.elasticsearch.action.admin.indices.rollover.RolloverConfiguration;
 import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
 import org.elasticsearch.action.admin.indices.rollover.RolloverResponse;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
@@ -78,7 +78,7 @@ public class DataLifecycleService implements ClusterStateListener, Closeable, Sc
     private final DataLifecycleErrorStore errorStore;
     private volatile boolean isMaster = false;
     private volatile TimeValue pollInterval;
-    private volatile RolloverConditions rolloverConditions;
+    private volatile RolloverConfiguration rolloverConfiguration;
     private SchedulerEngine.Job scheduledJob;
     private final SetOnce<SchedulerEngine> scheduler = new SetOnce<>();
 
@@ -100,7 +100,7 @@ public DataLifecycleService(
         this.errorStore = errorStore;
         this.scheduledJob = null;
         this.pollInterval = DLM_POLL_INTERVAL_SETTING.get(settings);
-        this.rolloverConditions = clusterService.getClusterSettings().get(DataLifecycle.CLUSTER_DLM_DEFAULT_ROLLOVER_SETTING);
+        this.rolloverConfiguration = clusterService.getClusterSettings().get(DataLifecycle.CLUSTER_DLM_DEFAULT_ROLLOVER_SETTING);
     }
 
     /**
@@ -110,7 +110,7 @@ public void init() {
         clusterService.addListener(this);
         clusterService.getClusterSettings().addSettingsUpdateConsumer(DLM_POLL_INTERVAL_SETTING, this::updatePollInterval);
         clusterService.getClusterSettings()
-            .addSettingsUpdateConsumer(DataLifecycle.CLUSTER_DLM_DEFAULT_ROLLOVER_SETTING, this::updateRolloverConditions);
+            .addSettingsUpdateConsumer(DataLifecycle.CLUSTER_DLM_DEFAULT_ROLLOVER_SETTING, this::updateRolloverConfiguration);
     }
 
     @Override
@@ -214,7 +214,11 @@ private void clearErrorStoreForUnmanagedIndices(DataStream dataStream) {
     private void maybeExecuteRollover(ClusterState state, DataStream dataStream) {
         Index writeIndex = dataStream.getWriteIndex();
         if (dataStream.isIndexManagedByDLM(writeIndex, state.metadata()::index)) {
-            RolloverRequest rolloverRequest = getDefaultRolloverRequest(dataStream.getName());
+            RolloverRequest rolloverRequest = getDefaultRolloverRequest(
+                rolloverConfiguration,
+                dataStream.getName(),
+                dataStream.getLifecycle().getDataRetention()
+            );
             transportActionsDeduplicator.executeOnce(
                 rolloverRequest,
                 new ErrorRecordingActionListener(writeIndex.getName(), errorStore),
@@ -360,9 +364,13 @@ public void onFailure(Exception e) {
         }
     }
 
-    private RolloverRequest getDefaultRolloverRequest(String dataStream) {
+    static RolloverRequest getDefaultRolloverRequest(
+        RolloverConfiguration rolloverConfiguration,
+        String dataStream,
+        TimeValue dataRetention
+    ) {
         RolloverRequest rolloverRequest = new RolloverRequest(dataStream, null).masterNodeTimeout(TimeValue.MAX_VALUE);
-        rolloverRequest.setConditions(rolloverConditions);
+        rolloverRequest.setConditions(rolloverConfiguration.resolveRolloverConditions(dataRetention));
         return rolloverRequest;
     }
 
@@ -371,8 +379,8 @@ private void updatePollInterval(TimeValue newInterval) {
         maybeScheduleJob();
     }
 
-    private void updateRolloverConditions(RolloverConditions newRolloverConditions) {
-        this.rolloverConditions = newRolloverConditions;
+    private void updateRolloverConfiguration(RolloverConfiguration newRolloverConfiguration) {
+        this.rolloverConfiguration = newRolloverConfiguration;
     }
 
     private void cancelJob() {

modules/dlm/src/main/java/org/elasticsearch/dlm/action/ExplainDataLifecycleAction.java

@@ -12,7 +12,7 @@
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.IndicesRequest;
-import org.elasticsearch.action.admin.indices.rollover.RolloverConditions;
+import org.elasticsearch.action.admin.indices.rollover.RolloverConfiguration;
 import org.elasticsearch.action.dlm.ExplainIndexDataLifecycle;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.master.MasterNodeReadRequest;
@@ -137,31 +137,31 @@ public static class Response extends ActionResponse implements ChunkedToXContent
         public static final ParseField INDICES_FIELD = new ParseField("indices");
         private List<ExplainIndexDataLifecycle> indices;
         @Nullable
-        private final RolloverConditions rolloverConditions;
+        private final RolloverConfiguration rolloverConfiguration;
 
-        public Response(List<ExplainIndexDataLifecycle> indices, @Nullable RolloverConditions rolloverConditions) {
+        public Response(List<ExplainIndexDataLifecycle> indices, @Nullable RolloverConfiguration rolloverConfiguration) {
             this.indices = indices;
-            this.rolloverConditions = rolloverConditions;
+            this.rolloverConfiguration = rolloverConfiguration;
         }
 
         public Response(StreamInput in) throws IOException {
             super(in);
             this.indices = in.readList(ExplainIndexDataLifecycle::new);
-            this.rolloverConditions = in.readOptionalWriteable(RolloverConditions::new);
+            this.rolloverConfiguration = in.readOptionalWriteable(RolloverConfiguration::new);
         }
 
         public List<ExplainIndexDataLifecycle> getIndices() {
             return indices;
         }
 
-        public RolloverConditions getRolloverConditions() {
-            return rolloverConditions;
+        public RolloverConfiguration getRolloverConfiguration() {
+            return rolloverConfiguration;
         }
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             out.writeList(indices);
-            out.writeOptionalWriteable(rolloverConditions);
+            out.writeOptionalWriteable(rolloverConfiguration);
         }
 
         @Override
@@ -173,20 +173,20 @@ public boolean equals(Object o) {
                 return false;
             }
             Response response = (Response) o;
-            return Objects.equals(indices, response.indices) && Objects.equals(rolloverConditions, response.rolloverConditions);
+            return Objects.equals(indices, response.indices) && Objects.equals(rolloverConfiguration, response.rolloverConfiguration);
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(indices, rolloverConditions);
+            return Objects.hash(indices, rolloverConfiguration);
         }
 
         @Override
         public Iterator<? extends ToXContent> toXContentChunked(ToXContent.Params outerParams) {
             final Iterator<? extends ToXContent> indicesIterator = indices.stream()
                 .map(explainIndexDataLifecycle -> (ToXContent) (builder, params) -> {
                     builder.field(explainIndexDataLifecycle.getIndex());
-                    explainIndexDataLifecycle.toXContent(builder, params, rolloverConditions);
+                    explainIndexDataLifecycle.toXContent(builder, params, rolloverConfiguration);
                     return builder;
                 })
                 .iterator();

modules/dlm/src/main/java/org/elasticsearch/dlm/action/GetDataLifecycleAction.java

@@ -11,7 +11,7 @@
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.IndicesRequest;
-import org.elasticsearch.action.admin.indices.rollover.RolloverConditions;
+import org.elasticsearch.action.admin.indices.rollover.RolloverConfiguration;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.master.MasterNodeReadRequest;
 import org.elasticsearch.cluster.metadata.DataLifecycle;
@@ -162,47 +162,47 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             /**
              * Converts the response to XContent and passes the RolloverConditions, when provided, to the data lifecycle.
              */
-            public XContentBuilder toXContent(XContentBuilder builder, Params params, @Nullable RolloverConditions rolloverConditions)
+            public XContentBuilder toXContent(XContentBuilder builder, Params params, @Nullable RolloverConfiguration rolloverConfiguration)
                 throws IOException {
                 builder.startObject();
                 builder.field(NAME_FIELD.getPreferredName(), dataStreamName);
                 builder.field(LIFECYCLE_FIELD.getPreferredName());
-                lifecycle.toXContent(builder, params, rolloverConditions);
+                lifecycle.toXContent(builder, params, rolloverConfiguration);
                 builder.endObject();
                 return builder;
             }
         }
 
         private final List<DataStreamLifecycle> dataStreamLifecycles;
         @Nullable
-        private final RolloverConditions rolloverConditions;
+        private final RolloverConfiguration rolloverConfiguration;
 
         public Response(List<DataStreamLifecycle> dataStreamLifecycles) {
             this(dataStreamLifecycles, null);
         }
 
-        public Response(List<DataStreamLifecycle> dataStreamLifecycles, @Nullable RolloverConditions rolloverConditions) {
+        public Response(List<DataStreamLifecycle> dataStreamLifecycles, @Nullable RolloverConfiguration rolloverConfiguration) {
             this.dataStreamLifecycles = dataStreamLifecycles;
-            this.rolloverConditions = rolloverConditions;
+            this.rolloverConfiguration = rolloverConfiguration;
         }
 
         public Response(StreamInput in) throws IOException {
-            this(in.readList(DataStreamLifecycle::new), in.readOptionalWriteable(RolloverConditions::new));
+            this(in.readList(DataStreamLifecycle::new), in.readOptionalWriteable(RolloverConfiguration::new));
         }
 
         public List<DataStreamLifecycle> getDataStreamLifecycles() {
             return dataStreamLifecycles;
         }
 
         @Nullable
-        public RolloverConditions getRolloverConditions() {
-            return rolloverConditions;
+        public RolloverConfiguration getRolloverConfiguration() {
+            return rolloverConfiguration;
         }
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             out.writeList(dataStreamLifecycles);
-            out.writeOptionalWriteable(rolloverConditions);
+            out.writeOptionalWriteable(rolloverConfiguration);
         }
 
         @Override
@@ -212,7 +212,7 @@ public Iterator<? extends ToXContent> toXContentChunked(ToXContent.Params outerP
                     dataStreamLifecycle -> (ToXContent) (builder, params) -> dataStreamLifecycle.toXContent(
                         builder,
                         params,
-                        rolloverConditions
+                        rolloverConfiguration
                     )
                 )
                 .iterator();
@@ -234,12 +234,12 @@ public boolean equals(Object o) {
             if (o == null || getClass() != o.getClass()) return false;
             Response response = (Response) o;
             return dataStreamLifecycles.equals(response.dataStreamLifecycles)
-                && Objects.equals(rolloverConditions, response.rolloverConditions);
+                && Objects.equals(rolloverConfiguration, response.rolloverConfiguration);
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(dataStreamLifecycles, rolloverConditions);
+            return Objects.hash(dataStreamLifecycles, rolloverConfiguration);
         }
     }
 }