Skip to content

Commit c1f65ed

Browse files
authored
[9.0] Update disable assertion jvm args from bwc/mixed cluster setups. i (#125220)
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.
1 parent 7f5bd6f commit c1f65ed

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private static ElasticsearchCluster buildCluster() {
5858
.feature(FeatureFlag.TIME_SERIES_MODE)
5959
.feature(FeatureFlag.FAILURE_STORE_ENABLED);
6060

61-
if (oldVersion.before(Version.fromString("9.0.0"))) {
61+
if (oldVersion.before(Version.fromString("8.18.0"))) {
6262
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
6363
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
6464
}

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private static ElasticsearchCluster buildCluster() {
119119
.feature(FeatureFlag.TIME_SERIES_MODE)
120120
.feature(FeatureFlag.FAILURE_STORE_ENABLED);
121121

122-
if (oldVersion.before(Version.fromString("9.0.0"))) {
122+
if (oldVersion.before(Version.fromString("8.18.0"))) {
123123
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
124124
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
125125
}

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/LogsIndexModeFullClusterRestartIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private static ElasticsearchCluster buildCluster() {
4848
.setting("xpack.security.enabled", "false")
4949
.setting("xpack.license.self_generated.type", "trial");
5050

51-
if (oldVersion.before(Version.fromString("9.0.0"))) {
51+
if (oldVersion.before(Version.fromString("8.18.0"))) {
5252
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
5353
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
5454
}

qa/mixed-cluster/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ buildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
9191
setting 'health.master_history.no_master_transitions_threshold', '10'
9292
}
9393
requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
94-
if (bwcVersion.before(Version.fromString("9.0.0"))) {
94+
if (bwcVersion.before(Version.fromString("8.18.0"))) {
9595
jvmArgs '-da:org.elasticsearch.index.mapper.DocumentMapper'
9696
jvmArgs '-da:org.elasticsearch.index.mapper.MapperService'
9797
}

qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/AbstractRollingUpgradeTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public String get() {
4545
.setting("xpack.security.enabled", "false")
4646
.feature(FeatureFlag.TIME_SERIES_MODE);
4747

48-
if (oldVersion.before(Version.fromString("9.0.0"))) {
48+
if (oldVersion.before(Version.fromString("8.18.0"))) {
4949
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
5050
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
5151
}

x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/java/org/elasticsearch/xpack/downsample/MixedClusterDownsampleRestIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private static ElasticsearchCluster buildCluster() {
3030
.setting("xpack.security.enabled", "false")
3131
.setting("xpack.license.self_generated.type", "trial");
3232

33-
if (oldVersion.before(Version.fromString("9.0.0"))) {
33+
if (oldVersion.before(Version.fromString("8.18.0"))) {
3434
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
3535
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
3636
}

x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/Clusters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static ElasticsearchCluster mixedVersionCluster() {
2323
.setting("xpack.security.enabled", "false")
2424
.setting("xpack.license.self_generated.type", "trial")
2525
.setting("cluster.routing.rebalance.enable", "none"); // disable relocation until we have retry in ESQL;
26-
if (oldVersion.before(Version.fromString("9.0.0"))) {
26+
if (oldVersion.before(Version.fromString("8.18.0"))) {
2727
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
2828
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
2929
}

0 commit comments

Comments
 (0)