Skip to content

Improve cancellation test #122085

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

Merged
merged 1 commit into from
Feb 7, 2025
Merged

Improve cancellation test #122085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,18 +358,6 @@ tests:
- class: org.elasticsearch.xpack.ml.integration.ClassificationIT
method: testDependentVariableIsAliasToKeyword
issue: https://github.com/elastic/elasticsearch/issues/121492
- class: org.elasticsearch.xpack.esql.action.CrossClustersCancellationIT
method: testTasks
issue: https://github.com/elastic/elasticsearch/issues/121626
- class: org.elasticsearch.xpack.esql.action.CrossClustersCancellationIT
method: testCloseSkipUnavailable
issue: https://github.com/elastic/elasticsearch/issues/121627
- class: org.elasticsearch.xpack.esql.action.CrossClustersCancellationIT
method: testCancel
issue: https://github.com/elastic/elasticsearch/issues/121632
- class: org.elasticsearch.xpack.esql.action.CrossClustersCancellationIT
method: testCancelSkipUnavailable
issue: https://github.com/elastic/elasticsearch/issues/121631
- class: org.elasticsearch.search.CrossClusterSearchUnavailableClusterIT
method: testSearchSkipUnavailable
issue: https://github.com/elastic/elasticsearch/issues/121497
Expand Down
9 changes: 6 additions & 3 deletions ...rnalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClustersCancellationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.elasticsearch.compute.operator.exchange.ExchangeService;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.tasks.TaskCancelledException;
import org.elasticsearch.tasks.TaskInfo;
import org.elasticsearch.test.AbstractMultiClustersTestCase;
import org.elasticsearch.transport.TransportService;
Expand All @@ -41,6 +42,7 @@
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.instanceOf;

public class CrossClustersCancellationIT extends AbstractMultiClustersTestCase {
private static final String REMOTE_CLUSTER = "cluster-a";
Expand Down Expand Up @@ -115,6 +117,7 @@ private void createLocalIndex(int numDocs) throws Exception {
mapping.startObject("const");
{
mapping.field("type", "long");
mapping.startObject("script").field("source", "").field("lang", "pause").endObject();
}
mapping.endObject();
}
Expand All @@ -123,7 +126,7 @@ private void createLocalIndex(int numDocs) throws Exception {
client(LOCAL_CLUSTER).admin().indices().prepareCreate("test").setMapping(mapping).get();
BulkRequestBuilder bulk = client(LOCAL_CLUSTER).prepareBulk("test").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
for (int i = 0; i < numDocs; i++) {
bulk.add(new IndexRequest().source("const", i));
bulk.add(new IndexRequest().source("foo", i));
}
bulk.get();
}
Expand Down Expand Up @@ -282,7 +285,7 @@ public void testCancelSkipUnavailable() throws Exception {
}

Exception error = expectThrows(Exception.class, requestFuture::actionGet);
assertThat(error.getMessage(), containsString("remote failed"));
assertThat(error, instanceOf(TaskCancelledException.class));
}

// Check that closing remote node with skip_unavailable=true produces partial
Expand Down Expand Up @@ -311,7 +314,7 @@ public void testCloseSkipUnavailable() throws Exception {
List<List<Object>> values = getValuesList(resp);
assertThat(values.get(0).size(), equalTo(1));
// 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
assertThat((long) values.get(0).get(0), greaterThanOrEqualTo(45L));
assertThat((long) values.get(0).get(0), greaterThanOrEqualTo(10L));

EsqlExecutionInfo.Cluster cluster = executionInfo.getCluster(REMOTE_CLUSTER);
EsqlExecutionInfo.Cluster localCluster = executionInfo.getCluster(LOCAL_CLUSTER);
Expand Down