From f3fb88bf072f738a4350ae694118eef66bc64ea9 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Wed, 19 Mar 2025 08:10:50 +0100 Subject: [PATCH] [9.0] Update disable assertion jvm args from bwc/mixed cluster setups. i Backporting #125074 to 9.0 branch. Remove `-da:org.elasticsearch.index.mapper.DocumentMapper` and `-da:org.elasticsearch.index.mapper.MapperService` from mixed cluster/bwc cluster setups. Given that #122606 is now backported to the 8.18 branch. --- .../elasticsearch/upgrades/FullClusterRestartDownsampleIT.java | 2 +- .../java/org/elasticsearch/upgrades/FullClusterRestartIT.java | 2 +- .../upgrades/LogsIndexModeFullClusterRestartIT.java | 2 +- qa/mixed-cluster/build.gradle | 2 +- .../elasticsearch/upgrades/AbstractRollingUpgradeTestCase.java | 2 +- .../xpack/downsample/MixedClusterDownsampleRestIT.java | 2 +- .../java/org/elasticsearch/xpack/esql/qa/mixed/Clusters.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java index 78be29f5b483f..7de8bbe9849fd 100644 --- a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java +++ b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java @@ -58,7 +58,7 @@ private static ElasticsearchCluster buildCluster() { .feature(FeatureFlag.TIME_SERIES_MODE) .feature(FeatureFlag.FAILURE_STORE_ENABLED); - if (oldVersion.before(Version.fromString("9.0.0"))) { + if (oldVersion.before(Version.fromString("8.18.0"))) { cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper"); cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService"); } diff --git a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java index 6ebb668420f92..464aebe83725b 100644 --- a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java +++ b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java @@ -119,7 +119,7 @@ private static ElasticsearchCluster buildCluster() { .feature(FeatureFlag.TIME_SERIES_MODE) .feature(FeatureFlag.FAILURE_STORE_ENABLED); - if (oldVersion.before(Version.fromString("9.0.0"))) { + if (oldVersion.before(Version.fromString("8.18.0"))) { cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper"); cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService"); } diff --git a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/LogsIndexModeFullClusterRestartIT.java b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/LogsIndexModeFullClusterRestartIT.java index a5c48dfb94b00..d677c6adf2459 100644 --- a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/LogsIndexModeFullClusterRestartIT.java +++ b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/LogsIndexModeFullClusterRestartIT.java @@ -48,7 +48,7 @@ private static ElasticsearchCluster buildCluster() { .setting("xpack.security.enabled", "false") .setting("xpack.license.self_generated.type", "trial"); - if (oldVersion.before(Version.fromString("9.0.0"))) { + if (oldVersion.before(Version.fromString("8.18.0"))) { cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper"); cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService"); } diff --git a/qa/mixed-cluster/build.gradle b/qa/mixed-cluster/build.gradle index 366835b7a991e..a747d1ade111a 100644 --- a/qa/mixed-cluster/build.gradle +++ b/qa/mixed-cluster/build.gradle @@ -91,7 +91,7 @@ buildParams.bwcVersions.withWireCompatible { bwcVersion, baseName -> setting 'health.master_history.no_master_transitions_threshold', '10' } requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0") - if (bwcVersion.before(Version.fromString("9.0.0"))) { + if (bwcVersion.before(Version.fromString("8.18.0"))) { jvmArgs '-da:org.elasticsearch.index.mapper.DocumentMapper' jvmArgs '-da:org.elasticsearch.index.mapper.MapperService' } diff --git a/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/AbstractRollingUpgradeTestCase.java b/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/AbstractRollingUpgradeTestCase.java index 94465e1c3e6ad..bfb90a97328e4 100644 --- a/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/AbstractRollingUpgradeTestCase.java +++ b/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/AbstractRollingUpgradeTestCase.java @@ -45,7 +45,7 @@ public String get() { .setting("xpack.security.enabled", "false") .feature(FeatureFlag.TIME_SERIES_MODE); - if (oldVersion.before(Version.fromString("9.0.0"))) { + if (oldVersion.before(Version.fromString("8.18.0"))) { cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper"); cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService"); } diff --git a/x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/java/org/elasticsearch/xpack/downsample/MixedClusterDownsampleRestIT.java b/x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/java/org/elasticsearch/xpack/downsample/MixedClusterDownsampleRestIT.java index 23fe0170011b4..a05009b6715b0 100644 --- a/x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/java/org/elasticsearch/xpack/downsample/MixedClusterDownsampleRestIT.java +++ b/x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/java/org/elasticsearch/xpack/downsample/MixedClusterDownsampleRestIT.java @@ -30,7 +30,7 @@ private static ElasticsearchCluster buildCluster() { .setting("xpack.security.enabled", "false") .setting("xpack.license.self_generated.type", "trial"); - if (oldVersion.before(Version.fromString("9.0.0"))) { + if (oldVersion.before(Version.fromString("8.18.0"))) { cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper"); cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService"); } diff --git a/x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/Clusters.java b/x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/Clusters.java index 99ef7bd434738..d011e5f51c544 100644 --- a/x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/Clusters.java +++ b/x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/Clusters.java @@ -23,7 +23,7 @@ public static ElasticsearchCluster mixedVersionCluster() { .setting("xpack.security.enabled", "false") .setting("xpack.license.self_generated.type", "trial") .setting("cluster.routing.rebalance.enable", "none"); // disable relocation until we have retry in ESQL; - if (oldVersion.before(Version.fromString("9.0.0"))) { + if (oldVersion.before(Version.fromString("8.18.0"))) { cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper"); cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService"); }