Skip to content

Commit ee3a8fe

Browse files
authored
Fix lucene compat tests by keeping asserts disabled (#136094) (#136111)
These asserts have been enabled for the lucene compat because `oldVersion` is now correctly set after #134584. Previously, in the Lucene compatibility tests, version was always set to `0.0.0` so the asserts were always disabled. Additionally, re-enable the tests that were muted because of the issue (cherry picked from commit b1a861e) # Conflicts: # muted-tests.yml
1 parent 11c33ae commit ee3a8fe

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,6 @@ tests:
259259
- class: org.elasticsearch.gradle.LoggedExecFuncTest
260260
method: failed tasks output logged to console when spooling true
261261
issue: https://github.com/elastic/elasticsearch/issues/119509
262-
- class: org.elasticsearch.upgrades.FullClusterRestartDownsampleIT
263-
method: testRollupIndex {cluster=UPGRADED}
264-
issue: https://github.com/elastic/elasticsearch/issues/135906
265262

266263
# Examples:
267264
#

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("8.18.0"))) {
61+
if (oldVersion.before(Version.fromString("8.18.0")) || isOldClusterDetachedVersion()) {
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("8.18.0"))) {
122+
if (oldVersion.before(Version.fromString("8.18.0")) || isOldClusterDetachedVersion()) {
123123
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
124124
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
125125
}

0 commit comments

Comments
 (0)