Skip to content

Commit dd3c694

Browse files
committed
[8.x] Update disable assertion jvm args from bwc/mixed cluster setups.
Backporting elastic#125074 to 8.x branch. Remove `-da:org.elasticsearch.index.mapper.DocumentMapper` and `-da:org.elasticsearch.index.mapper.MapperService` from mixed cluster/bwc cluster setups. Given that elastic#122606 is now backported to the 8.18 branch.
1 parent 0c8d6ba commit dd3c694

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
@@ -59,7 +59,7 @@ private static ElasticsearchCluster buildCluster() {
5959
.feature(FeatureFlag.TIME_SERIES_MODE)
6060
.feature(FeatureFlag.FAILURE_STORE_ENABLED);
6161

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

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
@@ -125,7 +125,7 @@ private static ElasticsearchCluster buildCluster() {
125125
.feature(FeatureFlag.TIME_SERIES_MODE)
126126
.feature(FeatureFlag.FAILURE_STORE_ENABLED);
127127

128-
if (oldVersion.before(Version.fromString("8.19.0"))) {
128+
if (oldVersion.before(Version.fromString("8.18.0"))) {
129129
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
130130
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
131131
}

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
@@ -49,7 +49,7 @@ private static ElasticsearchCluster buildCluster() {
4949
.setting("xpack.security.enabled", "false")
5050
.setting("xpack.license.self_generated.type", "trial");
5151

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

qa/mixed-cluster/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ buildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
8585
setting 'health.master_history.no_master_transitions_threshold', '10'
8686
}
8787
requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
88-
if (bwcVersion.before(Version.fromString("8.19.0"))) {
88+
if (bwcVersion.before(Version.fromString("8.18.0"))) {
8989
jvmArgs '-da:org.elasticsearch.index.mapper.DocumentMapper'
9090
jvmArgs '-da:org.elasticsearch.index.mapper.MapperService'
9191
}

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("8.19.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("8.19.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
@@ -25,7 +25,7 @@ public static ElasticsearchCluster mixedVersionCluster() {
2525
if (supportRetryOnShardFailures(oldVersion) == false) {
2626
cluster.setting("cluster.routing.rebalance.enable", "none");
2727
}
28-
if (oldVersion.before(Version.fromString("8.19.0"))) {
28+
if (oldVersion.before(Version.fromString("8.18.0"))) {
2929
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
3030
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
3131
}

0 commit comments

Comments
 (0)