Skip to content

ES|QL: Handle CCS tests for FORK #136468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
+1 −28
Draft

ES|QL: Handle CCS tests for FORK #136468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
460551b
Disable noisy FORK tests
ioanatia Oct 13, 2025
e2b07aa
Remove tests from muted-tests.yml
ioanatia Oct 13, 2025
1ffb209
[CI] Auto commit changes from spotless
Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,9 +453,6 @@ tests:
- class: org.elasticsearch.xpack.esql.plugin.CanMatchIT
method: testAliasFilters
issue: https://github.com/elastic/elasticsearch/issues/134512
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
method: test {csv-spec:fork.FiveFork}
issue: https://github.com/elastic/elasticsearch/issues/134560
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
method: test {csv-spec:spatial.ConvertCartesianFromStringParseError}
issue: https://github.com/elastic/elasticsearch/issues/134635
Expand All @@ -477,9 +474,6 @@ tests:
- class: org.elasticsearch.xpack.esql.expression.function.scalar.score.DecayTests
method: "testEvaluateBlockWithNulls {TestCase=<integer>, <integer>, <integer>, <_source> #2}"
issue: https://github.com/elastic/elasticsearch/issues/134679
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
method: test {csv-spec:fork.ForkBeforeStatsByWithWhere}
issue: https://github.com/elastic/elasticsearch/issues/134817
- class: org.elasticsearch.repositories.blobstore.testkit.analyze.MinioRepositoryAnalysisRestIT
method: testRepositoryAnalysis
issue: https://github.com/elastic/elasticsearch/issues/134853
Expand All @@ -498,15 +492,9 @@ tests:
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
method: test {csv-spec:stats.CountDistinctWithConditions}
issue: https://github.com/elastic/elasticsearch/issues/134993
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
method: test {csv-spec:fork.ForkBeforeStatsWithWhere}
issue: https://github.com/elastic/elasticsearch/issues/135041
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeMetricsIT
method: test
issue: https://github.com/elastic/elasticsearch/issues/135055
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
method: test {csv-spec:fork.ForkWithStats}
issue: https://github.com/elastic/elasticsearch/issues/135116
- class: org.elasticsearch.xpack.esql.heap_attack.HeapAttackIT
method: testLookupExplosionBigString
issue: https://github.com/elastic/elasticsearch/issues/135122
Expand Down Expand Up @@ -555,9 +543,6 @@ tests:
- class: org.elasticsearch.xpack.logsdb.qa.BulkDynamicMappingChallengeRestIT
method: testMatchAllQuery
issue: https://github.com/elastic/elasticsearch/issues/135820
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
method: test {csv-spec:fork.ForkAfterEnrich}
issue: https://github.com/elastic/elasticsearch/issues/135830
- class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartialResultsIT
method: testOneRemoteClusterPartial
issue: https://github.com/elastic/elasticsearch/issues/124055
Expand All @@ -570,15 +555,9 @@ tests:
- class: org.elasticsearch.xpack.logsdb.qa.BulkDynamicMappingChallengeRestIT
method: testHistogramAggregation
issue: https://github.com/elastic/elasticsearch/issues/136002
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
method: test {csv-spec:fork.ForkWithFiltersOnConstantValues}
issue: https://github.com/elastic/elasticsearch/issues/136031
- class: org.elasticsearch.xpack.security.authz.microsoft.MicrosoftGraphAuthzPluginIT
method: testConcurrentAuthentication
issue: https://github.com/elastic/elasticsearch/issues/135777
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
method: test {csv-spec:fork.ForkBranchWithInlineStats}
issue: https://github.com/elastic/elasticsearch/issues/136091
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
method: test {csv-spec:date.EvalDateTruncQuarterlyIntervalWithGTInRange}
issue: https://github.com/elastic/elasticsearch/issues/136102
Expand Down
8 changes: 1 addition & 7 deletions ...i-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.CSV_DATASET_MAP;
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.ENRICH_SOURCE_INDICES;
import static org.elasticsearch.xpack.esql.EsqlTestUtils.classpathResources;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.ENABLE_FORK_FOR_REMOTE_INDICES;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.ENABLE_LOOKUP_JOIN_ON_REMOTE;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.FORK_V9;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINE_STATS;
Expand Down Expand Up @@ -166,12 +165,7 @@ protected void shouldSkipTest(String testName) throws IOException {
// Tests that do SORT before LOOKUP JOIN - not supported in CCS
assumeFalse("LOOKUP JOIN after SORT not yet supported in CCS", testName.contains("OnTheCoordinator"));

if (testCase.requiredCapabilities.contains(FORK_V9.capabilityName())) {
assumeTrue(
"FORK not yet supported with CCS",
hasCapabilities(adminClient(), List.of(ENABLE_FORK_FOR_REMOTE_INDICES.capabilityName()))
);
}
assumeFalse("FORK not yet supported with CCS", testCase.requiredCapabilities.contains(FORK_V9.capabilityName()));
}

private TestFeatureService remoteFeaturesService() throws IOException {
Expand Down