Skip to content

Fix testProfile #106393

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
Mar 18, 2024
Merged

Fix testProfile #106393

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7185a6a
Fix testProfile
dnhatn Mar 17, 2024
ebdc8df
keep shard_partitioning
dnhatn Mar 18, 2024
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
32 changes: 30 additions & 2 deletions ...rc/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClustersQueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@

import org.elasticsearch.Build;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.compute.lucene.DataPartitioning;
Expand Down Expand Up @@ -121,12 +125,36 @@ public void testMetadataIndex() {
}
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/106273")
void waitForNoInitializingShards(Client client, TimeValue timeout, String... indices) {
ClusterHealthResponse resp = client.admin()
.cluster()
.prepareHealth(indices)
.setWaitForEvents(Priority.LANGUID)
.setWaitForNoRelocatingShards(true)
.setWaitForNoInitializingShards(true)
.setTimeout(timeout)
.get();
assertFalse(Strings.toString(resp, true, true), resp.isTimedOut());
}

public void testProfile() {
assumeTrue("pragmas only enabled on snapshot builds", Build.current().isSnapshot());
final int localOnlyProfiles;
// uses shard partitioning as segments can be merged during these queries
var pragmas = new QueryPragmas(Settings.builder().put(QueryPragmas.DATA_PARTITIONING.getKey(), DataPartitioning.SHARD).build());
// Use single replicas for the target indices, to make sure we hit the same set of target nodes
client(LOCAL_CLUSTER).admin()
.indices()
.prepareUpdateSettings("logs-1")
.setSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0).put("index.routing.rebalance.enable", "none"))
.get();
waitForNoInitializingShards(client(LOCAL_CLUSTER), TimeValue.timeValueSeconds(30), "logs-1");
client(REMOTE_CLUSTER).admin()
.indices()
.prepareUpdateSettings("logs-2")
.setSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0).put("index.routing.rebalance.enable", "none"))
.get();
waitForNoInitializingShards(client(REMOTE_CLUSTER), TimeValue.timeValueSeconds(30), "logs-2");
final int localOnlyProfiles;
{
EsqlQueryRequest request = new EsqlQueryRequest();
request.query("FROM logs* | stats sum(v)");
Expand Down