From f09dfcf0e1ed5e20e58134c0d024f5c189789869 Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Wed, 8 Oct 2025 14:53:02 -0500 Subject: [PATCH] Adding a test feature flag for random sampling --- muted-tests.yml | 9 --------- .../SmokeTestMultiNodeClientYamlTestSuiteIT.java | 1 + .../elasticsearch/test/rest/ClientYamlTestSuiteIT.java | 1 + .../java/org/elasticsearch/test/cluster/FeatureFlag.java | 1 + .../security/CoreWithSecurityClientYamlTestSuiteIT.java | 1 + 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index 9729788b6500d..967cb03699a34 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -603,24 +603,15 @@ tests: - class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT method: testTopNPushedToLuceneOnSortedIndex issue: https://github.com/elastic/elasticsearch/issues/135939 -- class: org.elasticsearch.test.rest.ClientYamlTestSuiteIT - method: test {yaml=indices.get_sample/10_basic/Test get sample for index with no sample config} - issue: https://github.com/elastic/elasticsearch/issues/135975 - class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT method: testStopQueryInlineStats issue: https://github.com/elastic/elasticsearch/issues/135032 - class: org.elasticsearch.xpack.esql.plan.logical.local.ImmediateLocalSupplierTests method: testEqualsAndHashcode issue: https://github.com/elastic/elasticsearch/issues/135977 -- class: org.elasticsearch.smoketest.SmokeTestMultiNodeClientYamlTestSuiteIT - method: test {yaml=indices.get_sample/10_basic/Test get sample for index with no sample config} - issue: https://github.com/elastic/elasticsearch/issues/135989 - class: org.elasticsearch.compute.data.BasicPageTests method: testEqualityAndHashCode issue: https://github.com/elastic/elasticsearch/issues/135990 -- class: org.elasticsearch.xpack.security.CoreWithSecurityClientYamlTestSuiteIT - method: test {yaml=indices.get_sample/10_basic/Test get sample for index with no sample config} - issue: https://github.com/elastic/elasticsearch/issues/135993 - class: org.elasticsearch.xpack.ml.integration.RegressionIT method: testAliasFields issue: https://github.com/elastic/elasticsearch/issues/135996 diff --git a/qa/smoke-test-multinode/src/yamlRestTest/java/org/elasticsearch/smoketest/SmokeTestMultiNodeClientYamlTestSuiteIT.java b/qa/smoke-test-multinode/src/yamlRestTest/java/org/elasticsearch/smoketest/SmokeTestMultiNodeClientYamlTestSuiteIT.java index 5014fd6c06be9..f44e13dd0e289 100644 --- a/qa/smoke-test-multinode/src/yamlRestTest/java/org/elasticsearch/smoketest/SmokeTestMultiNodeClientYamlTestSuiteIT.java +++ b/qa/smoke-test-multinode/src/yamlRestTest/java/org/elasticsearch/smoketest/SmokeTestMultiNodeClientYamlTestSuiteIT.java @@ -38,6 +38,7 @@ public class SmokeTestMultiNodeClientYamlTestSuiteIT extends ESClientYamlSuiteTe .feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED) .feature(FeatureFlag.DOC_VALUES_SKIPPER) .feature(FeatureFlag.SYNTHETIC_VECTORS) + .feature(FeatureFlag.RANDOM_SAMPLING) .build(); public SmokeTestMultiNodeClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { diff --git a/rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java b/rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java index fc68e496801b7..5f1a8b69d0c9b 100644 --- a/rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java +++ b/rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java @@ -38,6 +38,7 @@ public class ClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { .feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED) .feature(FeatureFlag.DOC_VALUES_SKIPPER) .feature(FeatureFlag.SYNTHETIC_VECTORS) + .feature(FeatureFlag.RANDOM_SAMPLING) .build(); public ClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { diff --git a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java index 644a5b46f4420..0e81225319036 100644 --- a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java +++ b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java @@ -26,6 +26,7 @@ public enum FeatureFlag { Version.fromString("9.2.0"), null ), + RANDOM_SAMPLING("es.random_sampling_feature_flag_enabled=true", Version.fromString("9.2.0"), null), ELASTIC_RERANKER_CHUNKING("es.elastic_reranker_chunking_long_documents=true", Version.fromString("9.2.0"), null); public final String systemProperty; diff --git a/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java b/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java index e8113fde1d494..efb001419277b 100644 --- a/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java +++ b/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java @@ -52,6 +52,7 @@ public class CoreWithSecurityClientYamlTestSuiteIT extends ESClientYamlSuiteTest .feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED) .feature(FeatureFlag.DOC_VALUES_SKIPPER) .feature(FeatureFlag.SYNTHETIC_VECTORS) + .feature(FeatureFlag.RANDOM_SAMPLING) .build(); public CoreWithSecurityClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {