Skip to content

Refactor CrossClusterQueryWithPartialResultsIT tests #124811

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 4 commits into from
Mar 14, 2025
Merged

Refactor CrossClusterQueryWithPartialResultsIT tests #124811

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa27e4c
Refactor CrossClusterQueryWithPartialResultsIT tests
smalyshev Mar 13, 2025
bfc43fb
Merge branch 'main' into refactor-partial-tests
smalyshev Mar 13, 2025
c5f1872
Merge branch 'main' into refactor-partial-tests
smalyshev Mar 13, 2025
3aa0c47
Merge branch 'main' into refactor-partial-tests
smalyshev Mar 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
86 changes: 34 additions & 52 deletions ...rTest/java/org/elasticsearch/xpack/esql/action/CrossClusterQueryWithPartialResultsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,25 @@ void populateIndices() throws Exception {
populateIndexWithFailingFields(REMOTE_CLUSTER_2, "fail-cluster2", remote2.failingShards);
}

private void assertClusterPartial(EsqlQueryResponse resp, String clusterAlias, ClusterSetup cluster) {
assertClusterPartial(resp, clusterAlias, cluster.okShards + cluster.failingShards, cluster.okShards);
}

private void assertClusterPartial(EsqlQueryResponse resp, String clusterAlias, int totalShards, int okShards) {
EsqlExecutionInfo.Cluster clusterInfo = resp.getExecutionInfo().getCluster(clusterAlias);
assertThat(clusterInfo.getTotalShards(), equalTo(totalShards));
assertThat(clusterInfo.getSuccessfulShards(), lessThanOrEqualTo(okShards));
assertThat(clusterInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.PARTIAL));
}

private void assertClusterSuccess(EsqlQueryResponse resp, String clusterAlias, int numShards) {
EsqlExecutionInfo.Cluster clusterInfo = resp.getExecutionInfo().getCluster(clusterAlias);
assertThat(clusterInfo.getTotalShards(), equalTo(numShards));
assertThat(clusterInfo.getSuccessfulShards(), equalTo(numShards));
assertThat(clusterInfo.getFailedShards(), equalTo(0));
assertThat(clusterInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.SUCCESSFUL));
}

public void testPartialResults() throws Exception {
populateIndices();
EsqlQueryRequest request = new EsqlQueryRequest();
Expand All @@ -91,22 +110,10 @@ public void testPartialResults() throws Exception {
assertTrue(returnedIds.add(id));
assertThat(id, is(in(allIds)));
}
if (request.includeCCSMetadata()) {
EsqlExecutionInfo.Cluster localInfo = resp.getExecutionInfo().getCluster(LOCAL_CLUSTER);
assertThat(localInfo.getTotalShards(), equalTo(local.okShards + local.failingShards));
assertThat(localInfo.getSuccessfulShards(), lessThanOrEqualTo(local.okShards));
assertThat(localInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.PARTIAL));

EsqlExecutionInfo.Cluster remote1Info = resp.getExecutionInfo().getCluster(REMOTE_CLUSTER_1);
assertThat(remote1Info.getTotalShards(), equalTo(remote1.okShards + remote1.failingShards));
assertThat(remote1Info.getSuccessfulShards(), lessThanOrEqualTo(remote1.okShards));
assertThat(localInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.PARTIAL));

EsqlExecutionInfo.Cluster remote2Info = resp.getExecutionInfo().getCluster(REMOTE_CLUSTER_2);
assertThat(remote2Info.getTotalShards(), equalTo(remote2.okShards + remote2.failingShards));
assertThat(remote2Info.getSuccessfulShards(), lessThanOrEqualTo(remote2.okShards));
assertThat(localInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.PARTIAL));
}
assertClusterPartial(resp, LOCAL_CLUSTER, local);
assertClusterPartial(resp, REMOTE_CLUSTER_1, remote1);
assertClusterPartial(resp, REMOTE_CLUSTER_2, remote2);
}
}

Expand All @@ -128,22 +135,10 @@ public void testOneRemoteClusterPartial() throws Exception {
assertTrue(returnedIds.add(id));
}
assertThat(returnedIds, equalTo(allIds));
if (request.includeCCSMetadata()) {
EsqlExecutionInfo.Cluster localInfo = resp.getExecutionInfo().getCluster(LOCAL_CLUSTER);
assertThat(localInfo.getTotalShards(), equalTo(local.okShards));
assertThat(localInfo.getSuccessfulShards(), equalTo(local.okShards));
assertThat(localInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.SUCCESSFUL));

EsqlExecutionInfo.Cluster remote1Info = resp.getExecutionInfo().getCluster(REMOTE_CLUSTER_1);
assertThat(remote1Info.getTotalShards(), equalTo(remote1.okShards));
assertThat(remote1Info.getSuccessfulShards(), equalTo(remote1.okShards));
assertThat(remote1Info.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.SUCCESSFUL));

EsqlExecutionInfo.Cluster remote2Info = resp.getExecutionInfo().getCluster(REMOTE_CLUSTER_2);
assertThat(remote2Info.getTotalShards(), equalTo(remote2.failingShards));
assertThat(remote2Info.getSuccessfulShards(), equalTo(0));
assertThat(remote2Info.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.PARTIAL));
}
assertClusterSuccess(resp, LOCAL_CLUSTER, local.okShards);
assertClusterSuccess(resp, REMOTE_CLUSTER_1, remote1.okShards);
assertClusterPartial(resp, REMOTE_CLUSTER_2, remote2.failingShards, 0);
}
}

Expand Down Expand Up @@ -195,15 +190,10 @@ public void sendResponse(Exception exception) {
assertTrue(returnedIds.add(id));
}
assertThat(returnedIds, equalTo(Sets.union(local.okIds, remote1.okIds)));
if (request.includeCCSMetadata()) {
EsqlExecutionInfo.Cluster localInfo = resp.getExecutionInfo().getCluster(LOCAL_CLUSTER);
assertThat(localInfo.getTotalShards(), equalTo(localInfo.getTotalShards()));
assertThat(localInfo.getSuccessfulShards(), equalTo(localInfo.getSuccessfulShards()));
assertThat(localInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.SUCCESSFUL));
assertClusterSuccess(resp, LOCAL_CLUSTER, local.okShards);

EsqlExecutionInfo.Cluster remoteInfo = resp.getExecutionInfo().getCluster(REMOTE_CLUSTER_1);
assertThat(remoteInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.PARTIAL));
}
EsqlExecutionInfo.Cluster remoteInfo = resp.getExecutionInfo().getCluster(REMOTE_CLUSTER_1);
assertThat(remoteInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.PARTIAL));
}
} finally {
for (TransportService transportService : cluster(REMOTE_CLUSTER_1).getInstances(TransportService.class)) {
Expand Down Expand Up @@ -248,15 +238,10 @@ public void testFailToStartRequestOnRemoteCluster() throws Exception {
assertTrue(returnedIds.add(id));
}
assertThat(returnedIds, equalTo(local.okIds));
if (request.includeCCSMetadata()) {
EsqlExecutionInfo.Cluster localInfo = resp.getExecutionInfo().getCluster(LOCAL_CLUSTER);
assertThat(localInfo.getTotalShards(), equalTo(local.okShards));
assertThat(localInfo.getSuccessfulShards(), equalTo(local.okShards));
assertThat(localInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.SUCCESSFUL));
assertClusterSuccess(resp, LOCAL_CLUSTER, local.okShards);

EsqlExecutionInfo.Cluster remoteInfo = resp.getExecutionInfo().getCluster(REMOTE_CLUSTER_1);
assertThat(remoteInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.PARTIAL));
}
EsqlExecutionInfo.Cluster remoteInfo = resp.getExecutionInfo().getCluster(REMOTE_CLUSTER_1);
assertThat(remoteInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.PARTIAL));
}
} finally {
for (TransportService transportService : cluster(REMOTE_CLUSTER_1).getInstances(TransportService.class)) {
Expand Down Expand Up @@ -299,13 +284,10 @@ public void testFailSearchShardsOnLocalCluster() throws Exception {
assertTrue(returnedIds.add(id));
}
assertThat(returnedIds, equalTo(remote1.okIds));
if (request.includeCCSMetadata()) {
EsqlExecutionInfo.Cluster localInfo = resp.getExecutionInfo().getCluster(LOCAL_CLUSTER);
assertThat(localInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.PARTIAL));
EsqlExecutionInfo.Cluster localInfo = resp.getExecutionInfo().getCluster(LOCAL_CLUSTER);
assertThat(localInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.PARTIAL));

EsqlExecutionInfo.Cluster remoteInfo = resp.getExecutionInfo().getCluster(REMOTE_CLUSTER_1);
assertThat(remoteInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.SUCCESSFUL));
}
assertClusterSuccess(resp, REMOTE_CLUSTER_1, remote1.okShards);
}
} finally {
for (TransportService transportService : cluster(LOCAL_CLUSTER).getInstances(TransportService.class)) {
Expand Down