github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add ensureGreen method for use with adminClient (#113425)

Browse source 
Current ensureGreen test helper method uses client() directly.
Sometimes is useful to call ensureGreen with adminClient() or
another rest client. This PR allows passing a RestClient into
ensureGreen.
This commit is contained in:
Parker Timmins 2024-09-24 08:39:58 -05:00 • committed by GitHub
parent d07d167430
commit c17cf18d5d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/changelog/113425.yaml Normal file
View file

@ -0,0 +1,5 @@
pr: 113425
summary: Add `ensureGreen` test method for use with `adminClient`
area: Infra/Metrics
type: enhancement
issues: []

6
test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
View file

@ -1721,7 +1721,11 @@ public abstract class ESRestTestCase extends ESTestCase {
* @param index index to test for
**/
public final void ensureGreen(String index) throws IOException {
ensureHealth(index, (request) -> {
ensureGreen(client(), index);
}
public final void ensureGreen(RestClient client, String index) throws IOException {
ensureHealth(client, index, (request) -> {
request.addParameter("wait_for_status", "green");
request.addParameter("wait_for_no_relocating_shards", "true");
final String ensureGreenTimeout = getEnsureGreenTimeout();

11
x-pack/qa/rolling-upgrade-multi-cluster/src/test/java/org/elasticsearch/upgrades/CcrRollingUpgradeIT.java
View file

@ -405,13 +405,8 @@ public class CcrRollingUpgradeIT extends AbstractMultiClusterUpgradeTestCase {
assertOK(client.performRequest(new Request("POST", "/" + followerIndex + "/_ccr/resume_follow")));
}
private static void ensureGreen(RestClient client, String index) throws IOException {
Request request = new Request("GET", "/_cluster/health/" + index);
request.addParameter("wait_for_status", "green");
request.addParameter("wait_for_no_relocating_shards", "true");
request.addParameter("timeout", "70s");
request.addParameter("level", "shards");
client.performRequest(request);
@Override
protected final String getEnsureGreenTimeout() {
return "70s";
}
}