Skip to content

[8.x] Re-enable shard rebalance in ES|QL rest tests (#122889) #122897

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
elasticsearchmachine merged 1 commit into from
Feb 18, 2025
Merged

[8.x] Re-enable shard rebalance in ES|QL rest tests (#122889) #122897

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
15 changes: 11 additions & 4 deletions ...r/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/Clusters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,22 @@
public class Clusters {
public static ElasticsearchCluster mixedVersionCluster() {
Version oldVersion = Version.fromString(System.getProperty("tests.old_cluster_version"));
return ElasticsearchCluster.local()
var cluster = ElasticsearchCluster.local()
.distribution(DistributionType.DEFAULT)
.withNode(node -> node.version(oldVersion))
.withNode(node -> node.version(Version.CURRENT))
.withNode(node -> node.version(oldVersion))
.withNode(node -> node.version(Version.CURRENT))
.setting("xpack.security.enabled", "false")
.setting("xpack.license.self_generated.type", "trial")
.setting("cluster.routing.rebalance.enable", "none") // disable relocation until we have retry in ESQL
.build();
.setting("xpack.license.self_generated.type", "trial");
if (supportRetryOnShardFailures(oldVersion) == false) {
cluster.setting("cluster.routing.rebalance.enable", "none");
}
return cluster.build();
}

private static boolean supportRetryOnShardFailures(Version version) {
return version.onOrAfter(Version.fromString("9.1.0"))
|| (version.onOrAfter(Version.fromString("8.19.0")) && version.before(Version.fromString("9.0.0")));
}
}
31 changes: 21 additions & 10 deletions ...erver/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/Clusters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,44 @@ public class Clusters {
static final String LOCAL_CLUSTER_NAME = "local_cluster";

public static ElasticsearchCluster remoteCluster() {
return ElasticsearchCluster.local()
Version version = distributionVersion("tests.version.remote_cluster");
var cluster = ElasticsearchCluster.local()
.name(REMOTE_CLUSTER_NAME)
.distribution(DistributionType.DEFAULT)
.version(distributionVersion("tests.version.remote_cluster"))
.version(version)
.nodes(2)
.setting("node.roles", "[data,ingest,master]")
.setting("xpack.security.enabled", "false")
.setting("xpack.license.self_generated.type", "trial")
.shared(true)
.setting("cluster.routing.rebalance.enable", "none")
.build();
.shared(true);
if (supportRetryOnShardFailures(version) == false) {
cluster.setting("cluster.routing.rebalance.enable", "none");
}
return cluster.build();
}

public static ElasticsearchCluster localCluster(ElasticsearchCluster remoteCluster) {
return localCluster(remoteCluster, true);
}

public static ElasticsearchCluster localCluster(ElasticsearchCluster remoteCluster, Boolean skipUnavailable) {
return ElasticsearchCluster.local()
Version version = distributionVersion("tests.version.local_cluster");
var cluster = ElasticsearchCluster.local()
.name(LOCAL_CLUSTER_NAME)
.distribution(DistributionType.DEFAULT)
.version(distributionVersion("tests.version.local_cluster"))
.version(version)
.nodes(2)
.setting("xpack.security.enabled", "false")
.setting("xpack.license.self_generated.type", "trial")
.setting("node.roles", "[data,ingest,master,remote_cluster_client]")
.setting("cluster.remote.remote_cluster.seeds", () -> "\"" + remoteCluster.getTransportEndpoint(0) + "\"")
.setting("cluster.remote.connections_per_cluster", "1")
.setting("cluster.remote." + REMOTE_CLUSTER_NAME + ".skip_unavailable", skipUnavailable.toString())
.shared(true)
.setting("cluster.routing.rebalance.enable", "none")
.build();
.shared(true);
if (supportRetryOnShardFailures(version) == false) {
cluster.setting("cluster.routing.rebalance.enable", "none");
}
return cluster.build();
}

public static org.elasticsearch.Version localClusterVersion() {
Expand All @@ -65,4 +71,9 @@ private static Version distributionVersion(String key) {
final String val = System.getProperty(key);
return val != null ? Version.fromString(val) : Version.CURRENT;
}

private static boolean supportRetryOnShardFailures(Version version) {
return version.onOrAfter(Version.fromString("9.1.0"))
|| (version.onOrAfter(Version.fromString("8.19.0")) && version.before(Version.fromString("9.0.0")));
}
}