Skip to content

[9.0] Improve CrossClusterAsyncEnrichStopIT test (#122432) #122442

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 2 commits into from
Feb 13, 2025
Merged

[9.0] Improve CrossClusterAsyncEnrichStopIT test (#122432) #122442

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b573b99
Improve CrossClusterAsyncEnrichStopIT test (#122432)
smalyshev Feb 12, 2025
4591213
fix backport
smalyshev Feb 12, 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
27 changes: 27 additions & 0 deletions ...alClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClusterAsyncEnrichStopIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@
package org.elasticsearch.xpack.esql.action;

import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.xcontent.XContentHelper;
import org.elasticsearch.compute.operator.DriverStatus;
import org.elasticsearch.compute.operator.DriverTaskRunner;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.tasks.TaskInfo;
import org.elasticsearch.xcontent.json.JsonXContent;
import org.elasticsearch.xpack.core.async.AsyncStopRequest;
import org.elasticsearch.xpack.esql.plan.logical.Enrich;
Expand All @@ -31,7 +35,9 @@
import static org.elasticsearch.xpack.esql.action.EsqlAsyncTestUtils.deleteAsyncId;
import static org.elasticsearch.xpack.esql.action.EsqlAsyncTestUtils.startAsyncQuery;
import static org.elasticsearch.xpack.esql.action.EsqlAsyncTestUtils.waitForCluster;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.not;

// This tests if enrich after stop works correctly
public class CrossClusterAsyncEnrichStopIT extends AbstractEnrichBasedCrossClusterTestCase {
Expand Down Expand Up @@ -87,10 +93,27 @@ public void testEnrichAfterStop() throws Exception {
// wait until c1 is done
waitForCluster(client(), "c1", asyncExecutionId);
waitForCluster(client(), LOCAL_CLUSTER, asyncExecutionId);
// wait until remote reduce task starts on c2
assertBusy(() -> {
List<TaskInfo> tasks = getDriverTasks(client(REMOTE_CLUSTER_2));
List<TaskInfo> reduceTasks = tasks.stream()
.filter(t -> t.status() instanceof DriverStatus ds && ds.taskDescription().equals("remote_reduce"))
.toList();
assertThat(reduceTasks, not(empty()));
});

// Run the stop request
var stopRequest = new AsyncStopRequest(asyncExecutionId);
var stopAction = client().execute(EsqlAsyncStopAction.INSTANCE, stopRequest);
// wait until remote reduce tasks are gone
assertBusy(() -> {
List<TaskInfo> tasks = getDriverTasks(client(REMOTE_CLUSTER_2));
List<TaskInfo> reduceTasks = tasks.stream()
.filter(t -> t.status() instanceof DriverStatus ds && ds.taskDescription().equals("remote_reduce"))
.toList();
assertThat(reduceTasks, empty());
});

// Allow the processing to proceed
SimplePauseFieldPlugin.allowEmitting.countDown();

Expand Down Expand Up @@ -153,4 +176,8 @@ record Event(long timestamp, String user, String host) {}
}
client.admin().indices().prepareRefresh("events").get();
}

static List<TaskInfo> getDriverTasks(Client client) {
return client.admin().cluster().prepareListTasks().setActions(DriverTaskRunner.ACTION_NAME).setDetailed(true).get().getTasks();
}
}