Skip to content

Commit e5f85e0

Browse files
committed
Remove disable assertion jvm args from bwc/mixed cluster setups.
Remove `-da:org.elasticsearch.index.mapper.DocumentMapper` and `-da:org.elasticsearch.index.mapper.MapperService` from cluster setup. Given that #122606 is now backported to the 8.18 branch.
1 parent a2d98e4 commit e5f85e0

File tree

7 files changed

+0
-28
lines changed

7 files changed

+0
-28
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ private static ElasticsearchCluster buildCluster() {
5858
.feature(FeatureFlag.TIME_SERIES_MODE)
5959
.feature(FeatureFlag.FAILURE_STORE_ENABLED);
6060

61-
if (oldVersion.before(Version.fromString("9.1.0"))) {
62-
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
63-
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
64-
}
6561
return cluster.build();
6662
}
6763

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,6 @@ private static ElasticsearchCluster buildCluster() {
119119
.feature(FeatureFlag.TIME_SERIES_MODE)
120120
.feature(FeatureFlag.FAILURE_STORE_ENABLED);
121121

122-
if (oldVersion.before(Version.fromString("9.1.0"))) {
123-
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
124-
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
125-
}
126122
return cluster.build();
127123
}
128124

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ 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.1.0"))) {
52-
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
53-
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
54-
}
5551
return cluster.build();
5652
}
5753

qa/mixed-cluster/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,6 @@ 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.1.0"))) {
95-
jvmArgs '-da:org.elasticsearch.index.mapper.DocumentMapper'
96-
jvmArgs '-da:org.elasticsearch.index.mapper.MapperService'
97-
}
9894
}
9995

10096
tasks.register("${baseName}#mixedClusterTest", StandaloneRestIntegTestTask) {

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ public String get() {
4545
.setting("xpack.security.enabled", "false")
4646
.feature(FeatureFlag.TIME_SERIES_MODE);
4747

48-
if (oldVersion.before(Version.fromString("9.1.0"))) {
49-
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
50-
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
51-
}
5248
return cluster.build();
5349
}
5450

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ 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.1.0"))) {
34-
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
35-
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
36-
}
3733
return cluster.build();
3834
}
3935

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ public static ElasticsearchCluster mixedVersionCluster() {
2525
if (supportRetryOnShardFailures(oldVersion) == false) {
2626
cluster.setting("cluster.routing.rebalance.enable", "none");
2727
}
28-
if (oldVersion.before(Version.fromString("9.1.0"))) {
29-
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
30-
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
31-
}
3228
return cluster.build();
3329
}
3430

0 commit comments

Comments
 (0)