Skip to content

Commit 032b88d

Browse files
smalyshevafoucret
authored andcommitted
Remove testCloseSkipUnavailable (elastic#123054)
* Remove testCloseSkipUnavailable It duplicates CrossClusterQueryWithPartialResultsIT so there's no more need of it.
1 parent b3a9102 commit 032b88d

File tree

2 files changed

+0
-44
lines changed

2 files changed

+0
-44
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,6 @@ tests:
274274
- class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
275275
method: test {yaml=reference/cat/health/cat-health-example}
276276
issue: https://github.com/elastic/elasticsearch/issues/122335
277-
- class: org.elasticsearch.xpack.esql.action.CrossClusterCancellationIT
278-
method: testCloseSkipUnavailable
279-
issue: https://github.com/elastic/elasticsearch/issues/122336
280277
- class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
281278
method: test {yaml=reference/alias/line_260}
282279
issue: https://github.com/elastic/elasticsearch/issues/122343

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClusterCancellationIT.java

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
package org.elasticsearch.xpack.esql.action;
99

10-
import org.elasticsearch.Build;
1110
import org.elasticsearch.action.ActionFuture;
1211
import org.elasticsearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest;
1312
import org.elasticsearch.action.admin.cluster.node.tasks.cancel.TransportCancelTasksAction;
@@ -287,44 +286,4 @@ public void testCancelSkipUnavailable() throws Exception {
287286
Exception error = expectThrows(Exception.class, requestFuture::actionGet);
288287
assertThat(error, instanceOf(TaskCancelledException.class));
289288
}
290-
291-
// Check that closing remote node with skip_unavailable=true produces partial
292-
public void testCloseSkipUnavailable() throws Exception {
293-
// We are using delay() here because closing cluster while inside pause fields doesn't seem to produce clean closure
294-
assumeTrue("Only snapshot builds have delay()", Build.current().isSnapshot());
295-
createRemoteIndex(between(1000, 5000));
296-
createLocalIndex(10);
297-
EsqlQueryRequest request = EsqlQueryRequest.syncEsqlQueryRequest();
298-
request.query("""
299-
FROM test*,cluster-a:test* METADATA _index
300-
| EVAL cluster=MV_FIRST(SPLIT(_index, ":"))
301-
| WHERE CASE(cluster == "cluster-a", delay(1ms), true)
302-
| STATS total = sum(const) | LIMIT 1
303-
""");
304-
request.pragmas(randomPragmas());
305-
var requestFuture = client().execute(EsqlQueryAction.INSTANCE, request);
306-
assertTrue(SimplePauseFieldPlugin.startEmitting.await(30, TimeUnit.SECONDS));
307-
SimplePauseFieldPlugin.allowEmitting.countDown();
308-
cluster(REMOTE_CLUSTER).close();
309-
try (var resp = requestFuture.actionGet()) {
310-
EsqlExecutionInfo executionInfo = resp.getExecutionInfo();
311-
assertNotNull(executionInfo);
312-
assertThat(executionInfo.isPartial(), equalTo(true));
313-
314-
List<List<Object>> values = getValuesList(resp);
315-
assertThat(values.get(0).size(), equalTo(1));
316-
// We can't be sure of the exact value here as we don't know if any data from remote came in, but all local data should be there
317-
assertThat((long) values.get(0).get(0), greaterThanOrEqualTo(10L));
318-
319-
EsqlExecutionInfo.Cluster cluster = executionInfo.getCluster(REMOTE_CLUSTER);
320-
EsqlExecutionInfo.Cluster localCluster = executionInfo.getCluster(LOCAL_CLUSTER);
321-
322-
assertThat(localCluster.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.SUCCESSFUL));
323-
assertThat(localCluster.getSuccessfulShards(), equalTo(1));
324-
325-
assertThat(cluster.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.PARTIAL));
326-
assertThat(cluster.getSuccessfulShards(), equalTo(0));
327-
assertThat(cluster.getFailures().size(), equalTo(1));
328-
}
329-
}
330289
}

0 commit comments

Comments
 (0)