Skip to content

Commit 1d8bee7

Browse files
authored
Adding a test feature flag for random sampling (#136225)
This change makes sure that the random sampling feature flag is enabled for various yaml rest test runners even when running in non-snapshot mode. Closes #135975 Closes #135989 Closes #135993 Closes #136190
1 parent 1eb3dc3 commit 1d8bee7

File tree

5 files changed

+5
-10
lines changed

5 files changed

+5
-10
lines changed

muted-tests.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -603,24 +603,15 @@ tests:
603603
- class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT
604604
method: testTopNPushedToLuceneOnSortedIndex
605605
issue: https://github.com/elastic/elasticsearch/issues/135939
606-
- class: org.elasticsearch.test.rest.ClientYamlTestSuiteIT
607-
method: test {yaml=indices.get_sample/10_basic/Test get sample for index with no sample config}
608-
issue: https://github.com/elastic/elasticsearch/issues/135975
609606
- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT
610607
method: testStopQueryInlineStats
611608
issue: https://github.com/elastic/elasticsearch/issues/135032
612609
- class: org.elasticsearch.xpack.esql.plan.logical.local.ImmediateLocalSupplierTests
613610
method: testEqualsAndHashcode
614611
issue: https://github.com/elastic/elasticsearch/issues/135977
615-
- class: org.elasticsearch.smoketest.SmokeTestMultiNodeClientYamlTestSuiteIT
616-
method: test {yaml=indices.get_sample/10_basic/Test get sample for index with no sample config}
617-
issue: https://github.com/elastic/elasticsearch/issues/135989
618612
- class: org.elasticsearch.compute.data.BasicPageTests
619613
method: testEqualityAndHashCode
620614
issue: https://github.com/elastic/elasticsearch/issues/135990
621-
- class: org.elasticsearch.xpack.security.CoreWithSecurityClientYamlTestSuiteIT
622-
method: test {yaml=indices.get_sample/10_basic/Test get sample for index with no sample config}
623-
issue: https://github.com/elastic/elasticsearch/issues/135993
624615
- class: org.elasticsearch.xpack.ml.integration.RegressionIT
625616
method: testAliasFields
626617
issue: https://github.com/elastic/elasticsearch/issues/135996

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
@@ -38,6 +38,7 @@ public class SmokeTestMultiNodeClientYamlTestSuiteIT extends ESClientYamlSuiteTe
3838
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
3939
.feature(FeatureFlag.DOC_VALUES_SKIPPER)
4040
.feature(FeatureFlag.SYNTHETIC_VECTORS)
41+
.feature(FeatureFlag.RANDOM_SAMPLING)
4142
.build();
4243

4344
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
@@ -38,6 +38,7 @@ public class ClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
3838
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
3939
.feature(FeatureFlag.DOC_VALUES_SKIPPER)
4040
.feature(FeatureFlag.SYNTHETIC_VECTORS)
41+
.feature(FeatureFlag.RANDOM_SAMPLING)
4142
.build();
4243

4344
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
@@ -25,7 +25,8 @@ public enum FeatureFlag {
2525
"es.index_dimensions_tsid_optimization_feature_flag_enabled=true",
2626
Version.fromString("9.2.0"),
2727
null
28-
);
28+
),
29+
RANDOM_SAMPLING("es.random_sampling_feature_flag_enabled=true", Version.fromString("9.2.0"), null);
2930

3031
public final String systemProperty;
3132
public final Version from;

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
@@ -52,6 +52,7 @@ public class CoreWithSecurityClientYamlTestSuiteIT extends ESClientYamlSuiteTest
5252
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
5353
.feature(FeatureFlag.DOC_VALUES_SKIPPER)
5454
.feature(FeatureFlag.SYNTHETIC_VECTORS)
55+
.feature(FeatureFlag.RANDOM_SAMPLING)
5556
.build();
5657

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

0 commit comments

Comments
 (0)