Skip to content

Commit fc65c06

Browse files
committed
Bwc tests fix
1 parent 89c7db7 commit fc65c06

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@
4848
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.CSV_DATASET_MAP;
4949
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.ENRICH_SOURCE_INDICES;
5050
import static org.elasticsearch.xpack.esql.EsqlTestUtils.classpathResources;
51+
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.ENABLE_FORK_FOR_REMOTE_INDICES;
5152
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.ENABLE_LOOKUP_JOIN_ON_REMOTE;
53+
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.FORK_V9;
5254
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS;
5355
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS_V11;
5456
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.JOIN_LOOKUP_V12;
@@ -154,6 +156,13 @@ protected void shouldSkipTest(String testName) throws IOException {
154156
);
155157
// Tests that do SORT before LOOKUP JOIN - not supported in CCS
156158
assumeFalse("LOOKUP JOIN after SORT not yet supported in CCS", testName.contains("OnTheCoordinator"));
159+
160+
if (testCase.requiredCapabilities.contains(FORK_V9.capabilityName())) {
161+
assumeTrue(
162+
"FORK not yet supported with CCS",
163+
hasCapabilities(adminClient(), List.of(ENABLE_FORK_FOR_REMOTE_INDICES.capabilityName()))
164+
);
165+
}
157166
}
158167

159168
@Override

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1411,7 +1411,12 @@ public enum Cap {
14111411
/**
14121412
* URL encoding function.
14131413
*/
1414-
URL_ENCODE(Build.current().isSnapshot());
1414+
URL_ENCODE(Build.current().isSnapshot()),
1415+
1416+
/**
1417+
* FORK with remote indices
1418+
*/
1419+
ENABLE_FORK_FOR_REMOTE_INDICES;
14151420

14161421
private final boolean enabled;
14171422

0 commit comments

Comments
 (0)