Remove the original LogsdbIndexingRollingUpgradeIT test suite.

Author: martijnvg

x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/AbstractStringTypeRollingUpgradeIT.java

@@ -36,6 +36,7 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.notNullValue;
 
 public abstract class AbstractStringTypeRollingUpgradeIT extends AbstractRollingUpgradeWithSecurityTestCase {
@@ -115,7 +116,7 @@ protected void testIndexing(boolean shouldIncludeKeywordMultifield) throws Excep
             assertThat(((Map<?, ?>) settings.get("defaults")).get("index.mapping.source.mode"), equalTo("SYNTHETIC"));
 
             // then continued - verify that the created data stream using the created template
-            LogsdbIndexingRollingUpgradeIT.assertDataStream(dataStreamName, templateId);
+            assertDataStream(dataStreamName, templateId);
 
             // when/then - run some queries and verify results
             ensureGreen(dataStreamName);
@@ -184,7 +185,7 @@ static void createTemplate(String dataStreamName, String id, String template) th
         assertOK(client().performRequest(putIndexTemplateRequest));
     }
 
-    private void bulkIndex(String dataStreamName, int numRequest, int numDocs) throws Exception {
+    static String bulkIndex(String dataStreamName, int numRequest, int numDocs) throws Exception {
         String firstIndex = null;
         Instant startTime = Instant.now().minusSeconds(60 * 60);
 
@@ -202,9 +203,10 @@ private void bulkIndex(String dataStreamName, int numRequest, int numDocs) throw
                 firstIndex = (String) ((Map<?, ?>) ((Map<?, ?>) ((List<?>) responseBody.get("items")).get(0)).get("create")).get("_index");
             }
         }
+        return firstIndex;
     }
 
-    private String bulkIndexRequestBody(String dataStreamName, int numDocs, Instant startTime) {
+    static String bulkIndexRequestBody(String dataStreamName, int numDocs, Instant startTime) {
         StringBuilder requestBody = new StringBuilder();
 
         for (int j = 0; j < numDocs; j++) {
@@ -245,7 +247,7 @@ private static String randomAlphasDelimitedBySpace(int maxAlphas, int minCodeUni
         return String.join(" ", alphas);
     }
 
-    private void recordSmallestMessage(final String dataStreamName, final String message) {
+    private static void recordSmallestMessage(final String dataStreamName, final String message) {
         if (smallestMessageMap.containsKey(dataStreamName) == false || message.compareTo(smallestMessageMap.get(dataStreamName)) < 0) {
             smallestMessageMap.put(dataStreamName, message);
         }
@@ -341,6 +343,16 @@ static Map<String, Object> getIndexSettingsWithDefaults(String index) throws IOE
         }
     }
 
+    static void assertDataStream(String dataStreamName, String templateId) throws IOException {
+        var getDataStreamsRequest = new Request("GET", "/_data_stream/" + dataStreamName);
+        var getDataStreamResponse = client().performRequest(getDataStreamsRequest);
+        assertOK(getDataStreamResponse);
+        var dataStreams = entityAsMap(getDataStreamResponse);
+        assertThat(ObjectPath.evaluate(dataStreams, "data_streams.0.name"), equalTo(dataStreamName));
+        assertThat(ObjectPath.evaluate(dataStreams, "data_streams.0.indices"), hasSize(1));
+        assertThat(ObjectPath.evaluate(dataStreams, "data_streams.0.template"), equalTo(templateId));
+    }
+
     static String formatInstant(Instant instant) {
         return DateFormatter.forPattern(FormatNames.STRICT_DATE_OPTIONAL_TIME.getName()).format(instant);
     }

x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsUsageRollingUpgradeIT.java

@@ -14,11 +14,10 @@
 import org.elasticsearch.client.Request;
 
 import java.io.IOException;
-import java.time.Instant;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import static org.elasticsearch.upgrades.LogsdbIndexingRollingUpgradeIT.bulkIndex;
+import static org.elasticsearch.upgrades.AbstractStringTypeRollingUpgradeIT.bulkIndex;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.not;
@@ -33,7 +32,7 @@ public void testUsage() throws Exception {
         assumeFalse("logsdb.prior_logs_usage only gets set in 8.x", oldClusterHasFeature("gte_v9.0.0"));
         String dataStreamName = "logs-mysql-error";
         if (isOldCluster()) {
-            bulkIndex(dataStreamName, 4, 256, Instant.now());
+            bulkIndex(dataStreamName, 4, 256);
             ensureGreen(dataStreamName);
             assertBusy(() -> {
                 var getClusterSettingsResponse = getClusterSettings();
@@ -42,7 +41,7 @@ public void testUsage() throws Exception {
             }, 2, TimeUnit.MINUTES);
         } else {
             String newIndex = rolloverDataStream(dataStreamName);
-            bulkIndex(dataStreamName, 4, 256, Instant.now());
+            bulkIndex(dataStreamName, 4, 256);
             Map<?, ?> indexResponse = (Map<?, ?>) getIndexSettings(newIndex, true).get(newIndex);
             Map<?, ?> settings = (Map<?, ?>) indexResponse.get("settings");
             Map<?, ?> defaults = (Map<?, ?>) indexResponse.get("defaults");