diff --git a/docs/changelog/113425.yaml b/docs/changelog/113425.yaml new file mode 100644 index 000000000000..f31060bd5b62 --- /dev/null +++ b/docs/changelog/113425.yaml @@ -0,0 +1,5 @@ +pr: 113425 +summary: Add `ensureGreen` test method for use with `adminClient` +area: Infra/Metrics +type: enhancement +issues: [] diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java index 7950eb460d43..5c25e0cc3b0d 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java @@ -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(); diff --git a/x-pack/qa/rolling-upgrade-multi-cluster/src/test/java/org/elasticsearch/upgrades/CcrRollingUpgradeIT.java b/x-pack/qa/rolling-upgrade-multi-cluster/src/test/java/org/elasticsearch/upgrades/CcrRollingUpgradeIT.java index e08660eb6920..70255dcebcf9 100644 --- a/x-pack/qa/rolling-upgrade-multi-cluster/src/test/java/org/elasticsearch/upgrades/CcrRollingUpgradeIT.java +++ b/x-pack/qa/rolling-upgrade-multi-cluster/src/test/java/org/elasticsearch/upgrades/CcrRollingUpgradeIT.java @@ -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"; } - }