Skip to content

Commit ecb3a39

Browse files
lktsmartijnvg
andauthored
Address synthetic recovery source release test failures. (elastic#122035) (elastic#122099)
(cherry picked from commit d93f9c4) # Conflicts: # muted-tests.yml Co-authored-by: Martijn van Groningen <[email protected]>
1 parent f0f8b38 commit ecb3a39

File tree

5 files changed

+11
-1
lines changed

5 files changed

+11
-1
lines changed

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
@@ -37,6 +37,7 @@ public class ClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
3737
.module("data-streams")
3838
.feature(FeatureFlag.TIME_SERIES_MODE)
3939
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
40+
.feature(FeatureFlag.INDEX_RECOVERY_USE_SYNTHETIC_SOURCE)
4041
.build();
4142

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

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@
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(
23+
"es.index_recovery_use_synthetic_source_feature_flag_enabled=true",
24+
Version.fromString("8.18.0"),
25+
null
26+
);
2227

2328
public final String systemProperty;
2429
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)