Skip to content

Commit 11793ec

Browse files
committed
Address synthetic recovery source release test failures.
Configure feature flag in the test clusters Closes #122028 Closes #122027 Closes #122026 Closes #121991 Closes #121992
1 parent cff329e commit 11793ec

File tree

6 files changed

+7
-22
lines changed

6 files changed

+7
-22
lines changed

muted-tests.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -384,35 +384,14 @@ tests:
384384
- class: org.elasticsearch.analysis.common.CommonAnalysisClientYamlTestSuiteIT
385385
method: test {yaml=analysis-common/40_token_filters/stemmer_override file access}
386386
issue: https://github.com/elastic/elasticsearch/issues/121625
387-
- class: org.elasticsearch.test.rest.ClientYamlTestSuiteIT
388-
method: test {yaml=update/100_synthetic_source/stored text}
389-
issue: https://github.com/elastic/elasticsearch/issues/121964
390-
- class: org.elasticsearch.test.rest.ClientYamlTestSuiteIT
391-
method: test {yaml=update/100_synthetic_source/keyword}
392-
issue: https://github.com/elastic/elasticsearch/issues/121965
393387
- class: org.elasticsearch.xpack.esql.plugin.DataNodeRequestSenderTests
394388
method: testDoNotRetryOnRequestLevelFailure
395389
issue: https://github.com/elastic/elasticsearch/issues/121966
396390
- class: org.elasticsearch.xpack.searchablesnapshots.hdfs.SecureHdfsSearchableSnapshotsIT
397391
issue: https://github.com/elastic/elasticsearch/issues/121967
398-
- class: org.elasticsearch.smoketest.SmokeTestMultiNodeClientYamlTestSuiteIT
399-
method: test {yaml=update/100_synthetic_source/stored text}
400-
issue: https://github.com/elastic/elasticsearch/issues/121991
401-
- class: org.elasticsearch.smoketest.SmokeTestMultiNodeClientYamlTestSuiteIT
402-
method: test {yaml=update/100_synthetic_source/keyword}
403-
issue: https://github.com/elastic/elasticsearch/issues/121992
404392
- class: org.elasticsearch.action.search.SearchQueryThenFetchAsyncActionTests
405393
method: testBottomFieldSort
406394
issue: https://github.com/elastic/elasticsearch/issues/121503
407-
- class: org.elasticsearch.xpack.logsdb.LogsdbTestSuiteIT
408-
method: test {yaml=/60_synthetic_source_recovery/synthetic recovery for synthetic source mode index}
409-
issue: https://github.com/elastic/elasticsearch/issues/122026
410-
- class: org.elasticsearch.xpack.logsdb.LogsdbTestSuiteIT
411-
method: test {yaml=/60_synthetic_source_recovery/synthetic recovery for time_series index}
412-
issue: https://github.com/elastic/elasticsearch/issues/122027
413-
- class: org.elasticsearch.xpack.logsdb.LogsdbTestSuiteIT
414-
method: test {yaml=/60_synthetic_source_recovery/synthetic recovery for logsdb index}
415-
issue: https://github.com/elastic/elasticsearch/issues/122028
416395
- class: org.elasticsearch.xpack.application.CohereServiceUpgradeIT
417396
issue: https://github.com/elastic/elasticsearch/issues/121537
418397
- class: org.elasticsearch.xpack.migrate.action.ReindexDatastreamIndexTransportActionIT

qa/smoke-test-multinode/src/yamlRestTest/java/org/elasticsearch/smoketest/SmokeTestMultiNodeClientYamlTestSuiteIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public class SmokeTestMultiNodeClientYamlTestSuiteIT extends ESClientYamlSuiteTe
3636
.node(0, n -> n.setting("node.roles", "[master,data,ml,remote_cluster_client,transform]"))
3737
.feature(FeatureFlag.TIME_SERIES_MODE)
3838
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
39+
.feature(FeatureFlag.INDEX_RECOVERY_USE_SYNTHETIC_SOURCE)
3940
.build();
4041

4142
public SmokeTestMultiNodeClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {

rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public class ClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
3636
.module("data-streams")
3737
.feature(FeatureFlag.TIME_SERIES_MODE)
3838
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
39+
.feature(FeatureFlag.INDEX_RECOVERY_USE_SYNTHETIC_SOURCE)
3940
.build();
4041

4142
public ClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {

test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
public enum FeatureFlag {
1919
TIME_SERIES_MODE("es.index_mode_feature_flag_registered=true", Version.fromString("8.0.0"), null),
2020
FAILURE_STORE_ENABLED("es.failure_store_feature_flag_enabled=true", Version.fromString("8.12.0"), null),
21-
SUB_OBJECTS_AUTO_ENABLED("es.sub_objects_auto_feature_flag_enabled=true", Version.fromString("8.16.0"), null);
21+
SUB_OBJECTS_AUTO_ENABLED("es.sub_objects_auto_feature_flag_enabled=true", Version.fromString("8.16.0"), null),
22+
INDEX_RECOVERY_USE_SYNTHETIC_SOURCE("es.index_recovery_use_synthetic_source=true", Version.fromString("8.18.0"), null);
2223

2324
public final String systemProperty;
2425
public final Version from;

x-pack/plugin/logsdb/src/yamlRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbTestSuiteIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
1212

1313
import org.elasticsearch.test.cluster.ElasticsearchCluster;
14+
import org.elasticsearch.test.cluster.FeatureFlag;
1415
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
1516
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
1617
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
@@ -23,6 +24,7 @@ public class LogsdbTestSuiteIT extends ESClientYamlSuiteTestCase {
2324
.distribution(DistributionType.DEFAULT)
2425
.setting("xpack.security.enabled", "false")
2526
.setting("xpack.license.self_generated.type", "trial")
27+
.feature(FeatureFlag.INDEX_RECOVERY_USE_SYNTHETIC_SOURCE)
2628
.build();
2729

2830
public LogsdbTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {

x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public class CoreWithSecurityClientYamlTestSuiteIT extends ESClientYamlSuiteTest
5050
.user(USER, PASS)
5151
.feature(FeatureFlag.TIME_SERIES_MODE)
5252
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
53+
.feature(FeatureFlag.INDEX_RECOVERY_USE_SYNTHETIC_SOURCE)
5354
.build();
5455

5556
public CoreWithSecurityClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {

0 commit comments

Comments
 (0)