Polishing

Author: gmarouli

x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/DataStreamLifecycleDownsampleIT.java

@@ -9,6 +9,7 @@
 
 import org.elasticsearch.action.admin.indices.rollover.RolloverAction;
 import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
+import org.elasticsearch.action.datastreams.lifecycle.PutDataStreamLifecycleAction;
 import org.elasticsearch.action.downsample.DownsampleConfig;
 import org.elasticsearch.cluster.metadata.DataStreamLifecycle;
 import org.elasticsearch.common.settings.Settings;
@@ -24,6 +25,7 @@
 
 import static org.elasticsearch.cluster.metadata.ClusterChangedEventUtils.indicesCreated;
 import static org.elasticsearch.cluster.metadata.DataStreamTestHelper.backingIndexEqualTo;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.is;
 
 public class DataStreamLifecycleDownsampleIT extends DownsamplingIntegTestCase {
@@ -242,18 +244,26 @@ public void testUpdateDownsampleRound() throws Exception {
         // update the lifecycle so that it only has one round, for the same `after` parameter as before, but a different interval
         // the different interval should yield a different downsample index name so we expect the data stream lifecycle to get the previous
         // `10s` interval downsample index, downsample it to `20m` and replace it in the data stream instead of the `10s` one.
-        updateDataLifecycle(
-            dataStreamName,
-            DataStreamLifecycle.dataLifecycleBuilder()
-                .downsampling(
-                    List.of(
-                        new DataStreamLifecycle.DownsamplingRound(
-                            TimeValue.timeValueMillis(10),
-                            new DownsampleConfig(new DateHistogramInterval("20m"))
-                        )
+        DataStreamLifecycle lifecycle1 = DataStreamLifecycle.dataLifecycleBuilder()
+            .downsampling(
+                List.of(
+                    new DataStreamLifecycle.DownsamplingRound(
+                        TimeValue.timeValueMillis(10),
+                        new DownsampleConfig(new DateHistogramInterval("20m"))
                     )
                 )
-                .build()
+            )
+            .build();
+        assertAcked(
+            client().execute(
+                PutDataStreamLifecycleAction.INSTANCE,
+                new PutDataStreamLifecycleAction.Request(
+                    TEST_REQUEST_TIMEOUT,
+                    TEST_REQUEST_TIMEOUT,
+                    new String[] { dataStreamName },
+                    lifecycle1
+                )
+            )
         );
 
         String thirtySecondsDownsampleIndex = "downsample-20m-" + firstGenerationBackingIndex;

x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/DownsampleIT.java

@@ -30,7 +30,7 @@ public class DownsampleIT extends DownsamplingIntegTestCase {
 
     public void testDownsamplingPassthroughDimensions() throws Exception {
         String dataStreamName = "metrics-foo";
-
+        // Set up template
         putTSDBIndexTemplate("my-template", List.of("metrics-foo"), null, """
             {
               "properties": {
@@ -47,6 +47,7 @@ public void testDownsamplingPassthroughDimensions() throws Exception {
             }
             """, null, null);
 
+        // Create data stream by indexing documents
         final Instant now = Instant.now();
         Supplier<XContentBuilder> sourceSupplier = () -> {
             String ts = randomDateForRange(now.minusSeconds(60 * 60).toEpochMilli(), now.plusSeconds(60 * 29).toEpochMilli());
@@ -62,8 +63,8 @@ public void testDownsamplingPassthroughDimensions() throws Exception {
             }
         };
         bulkIndex(dataStreamName, sourceSupplier, 100);
+        // Rollover to ensure the index we will downsample is not the write index
         assertAcked(client().admin().indices().rolloverIndex(new RolloverRequest(dataStreamName, null)));
-
         List<String> backingIndices = waitForDataStreamBackingIndices(dataStreamName, 2);
         String sourceIndex = backingIndices.get(0);
         String interval = "5m";
@@ -82,6 +83,7 @@ public void testDownsamplingPassthroughDimensions() throws Exception {
             )
         );
 
+        // Wait for downsampling to complete
         SubscribableListener<Void> listener = ClusterServiceUtils.addMasterTemporaryStateListener(clusterState -> {
             final var indexMetadata = clusterState.metadata().getProject().index(targetIndex);
             if (indexMetadata == null) {

x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/DownsamplingIntegTestCase.java

@@ -17,7 +17,6 @@
 import org.elasticsearch.action.bulk.BulkItemResponse;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.datastreams.lifecycle.PutDataStreamLifecycleAction;
 import org.elasticsearch.action.downsample.DownsampleConfig;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.support.WriteRequest;
@@ -175,20 +174,6 @@ void putTSDBIndexTemplate(
         assertAcked(client().execute(TransportPutComposableIndexTemplateAction.TYPE, request));
     }
 
-    void updateDataLifecycle(String dataStreamName, DataStreamLifecycle lifecycle) throws IOException {
-        assertAcked(
-            client().execute(
-                PutDataStreamLifecycleAction.INSTANCE,
-                new PutDataStreamLifecycleAction.Request(
-                    TEST_REQUEST_TIMEOUT,
-                    TEST_REQUEST_TIMEOUT,
-                    new String[] { dataStreamName },
-                    lifecycle
-                )
-            )
-        );
-    }
-
     /**
      * Creates and indexes the specified number of documents using the docSource supplier.
      * @return the count of indexed documents