Skip to content

Commit d4777d5

Browse files
committed
disable assertion jvm arg work around
1 parent f3c6a9d commit d4777d5

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

qa/mixed-cluster/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ buildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
9090
if (bwcVersion.onOrAfter(Version.fromString("8.4.0"))) {
9191
setting 'health.master_history.no_master_transitions_threshold', '10'
9292
}
93+
// TODO: conditionally add jvmarg based on old version
94+
// Avoid tripping assertion on old nodes:
95+
jvmArgs '-da:org.elasticsearch.index.mapper.DocumentMapper'
9396
requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
9497
}
9598

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ public class MixedClusterDownsampleRestIT extends ESClientYamlSuiteTestCase {
2525
.withNode(node -> node.version(Version.CURRENT))
2626
.setting("xpack.security.enabled", "false")
2727
.setting("xpack.license.self_generated.type", "trial")
28+
// TODO: conditionally add jvmarg based on old version
29+
// Avoid tripping assertion on old nodes:
30+
.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper")
2831
.build();
2932

3033
static Version getOldVersion() {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ 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+
// TODO: conditionally add jvmarg based on old version
27+
// Avoid tripping assertion on old nodes:
28+
.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper")
2629
.build();
2730
}
2831
}

0 commit comments

Comments
 (0)