From 765401a33588b0fb57030f8e4232ebbeb95aee50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20J=C3=B3zala?= <377355+jozala@users.noreply.github.com> Date: Tue, 7 Oct 2025 18:41:24 +0200 Subject: [PATCH] Fix lucene compat tests by keeping asserts disabled (#136094) 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 b1a861e1a02f0530c1a42e5b53986ecee0fb9212) # Conflicts: # muted-tests.yml --- muted-tests.yml | 3 --- .../elasticsearch/upgrades/FullClusterRestartDownsampleIT.java | 2 +- .../java/org/elasticsearch/upgrades/FullClusterRestartIT.java | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index 73b22a3237270..674a18d8b4cd4 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -259,9 +259,6 @@ tests: - class: org.elasticsearch.gradle.LoggedExecFuncTest method: failed tasks output logged to console when spooling true issue: https://github.com/elastic/elasticsearch/issues/119509 -- class: org.elasticsearch.upgrades.FullClusterRestartDownsampleIT - method: testRollupIndex {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135906 # Examples: # diff --git a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java index b4c314bac0de1..513e1e8f4c9ae 100644 --- a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java +++ b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java @@ -58,7 +58,7 @@ private static ElasticsearchCluster buildCluster() { .feature(FeatureFlag.TIME_SERIES_MODE) .feature(FeatureFlag.FAILURE_STORE_ENABLED); - if (oldVersion.before(Version.fromString("8.18.0"))) { + if (oldVersion.before(Version.fromString("8.18.0")) || isOldClusterDetachedVersion()) { cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper"); cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService"); } diff --git a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java index 29344e6748845..b4e81cbcb531d 100644 --- a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java +++ b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java @@ -119,7 +119,7 @@ private static ElasticsearchCluster buildCluster() { .feature(FeatureFlag.TIME_SERIES_MODE) .feature(FeatureFlag.FAILURE_STORE_ENABLED); - if (oldVersion.before(Version.fromString("8.18.0"))) { + if (oldVersion.before(Version.fromString("8.18.0")) || isOldClusterDetachedVersion()) { cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper"); cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService"); }