Skip to content
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

Jump to bottom

[Backport 2.x] [Flaky Test] Fix Flaky Test ClusterRerouteIT.testDelayWithALargeAmountOfShards #14540

Merged
merged 1 commit into from
Jun 25, 2024
Merged

[Backport 2.x] [Flaky Test] Fix Flaky Test ClusterRerouteIT.testDelayWithALargeAmountOfShards #14540

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
3 changes: 2 additions & 1 deletion server/src/internalClusterTest/java/org/opensearch/cluster/allocation/ClusterRerouteIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,8 @@ public void testDelayWithALargeAmountOfShards() throws Exception {
internalCluster().stopRandomNode(InternalTestCluster.nameFilter(node_1));

// This might run slowly on older hardware
ensureGreen(TimeValue.timeValueMinutes(2));
// In some case, the shards will be rebalanced back and forth, it seems like a very low probability bug.
ensureGreen(TimeValue.timeValueMinutes(2), false);
}

private void rerouteWithAllocateLocalGateway(Settings commonSettings) throws Exception {
Expand Down
16 changes: 15 additions & 1 deletion test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,10 @@ public ClusterHealthStatus ensureGreen(TimeValue timeout, String... indices) {
return ensureColor(ClusterHealthStatus.GREEN, timeout, false, indices);
}

public ClusterHealthStatus ensureGreen(TimeValue timeout, boolean waitForNoRelocatingShards, String... indices) {
return ensureColor(ClusterHealthStatus.GREEN, timeout, waitForNoRelocatingShards, false, indices);
}

/**
* Ensures the cluster has a yellow state via the cluster health API.
*/
Expand Down Expand Up @@ -890,6 +894,16 @@ private ClusterHealthStatus ensureColor(
TimeValue timeout,
boolean waitForNoInitializingShards,
String... indices
) {
return ensureColor(clusterHealthStatus, timeout, true, waitForNoInitializingShards, indices);
}

private ClusterHealthStatus ensureColor(
ClusterHealthStatus clusterHealthStatus,
TimeValue timeout,
boolean waitForNoRelocatingShards,
boolean waitForNoInitializingShards,
String... indices
) {
String color = clusterHealthStatus.name().toLowerCase(Locale.ROOT);
String method = "ensure" + Strings.capitalize(color);
Expand All @@ -898,7 +912,7 @@ private ClusterHealthStatus ensureColor(
.timeout(timeout)
.waitForStatus(clusterHealthStatus)
.waitForEvents(Priority.LANGUID)
.waitForNoRelocatingShards(true)
.waitForNoRelocatingShards(waitForNoRelocatingShards)
.waitForNoInitializingShards(waitForNoInitializingShards)
// We currently often use ensureGreen or ensureYellow to check whether the cluster is back in a good state after shutting down
// a node. If the node that is stopped is the cluster-manager node, another node will become cluster-manager and publish a
Expand Down
Loading