From 95aa2fdd4050ee4fbf9cd947decece1f008c99ba Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Wed, 30 Oct 2024 08:08:33 +0100 Subject: [PATCH] remove logsdb legacy feature --- .../upgrades/LogsdbIndexingRollingUpgradeIT.java | 5 ++--- .../org/elasticsearch/test/rest/RestTestLegacyFeatures.java | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsdbIndexingRollingUpgradeIT.java b/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsdbIndexingRollingUpgradeIT.java index 2cf3a3b5bfe34..454b7c62d60c0 100644 --- a/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsdbIndexingRollingUpgradeIT.java +++ b/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsdbIndexingRollingUpgradeIT.java @@ -17,7 +17,6 @@ import org.elasticsearch.common.network.NetworkAddress; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.test.rest.ObjectPath; -import org.elasticsearch.test.rest.RestTestLegacyFeatures; import org.elasticsearch.xcontent.XContentType; import java.io.IOException; @@ -74,8 +73,8 @@ public LogsdbIndexingRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) public void testIndexing() throws Exception { assumeTrue( - "test relies on logsdb being available", - oldClusterHasFeature(RestTestLegacyFeatures.LOGSDB_TECH_PREVIEW) + "Logsdb is tech preview since 8.15.0", + getOldClusterTestVersion().onOrAfter("8.15.0") ); String dataStreamName = "logs-bwc-test"; if (isOldCluster()) { diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/RestTestLegacyFeatures.java b/test/framework/src/main/java/org/elasticsearch/test/rest/RestTestLegacyFeatures.java index 2f579219d5e6d..9f01e682de30a 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/RestTestLegacyFeatures.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/RestTestLegacyFeatures.java @@ -128,8 +128,6 @@ public class RestTestLegacyFeatures implements FeatureSpecification { public static final NodeFeature ES_QL_GA = new NodeFeature("esql.ga"); - public static final NodeFeature LOGSDB_TECH_PREVIEW = new NodeFeature("logsdb.tech_preview"); - /* * Starting with 8.11, cluster state has minimum system index mappings versions (#99307) and the system index mappings upgrade service * started using them to determine when to update mappings for system indices. See https://github.com/elastic/elasticsearch/pull/99668 @@ -189,8 +187,7 @@ public Map getHistoricalFeatures() { entry(DISABLE_FIELD_NAMES_FIELD_REMOVED, Version.V_8_0_0), entry(ML_NLP_SUPPORTED, Version.V_8_0_0), entry(MAPPINGS_UPGRADE_SERVICE_USES_MAPPINGS_VERSION, Version.V_8_11_0), - entry(ES_QL_GA, Version.V_8_14_0), - entry(LOGSDB_TECH_PREVIEW, Version.V_8_15_0) + entry(ES_QL_GA, Version.V_8_14_0) ); } }