Revert "Fix timeout in testDowngradeRemoteClusterToBasic (#52284)"

This reverts commit 1342f86.

Author: dnhatn

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

@@ -950,18 +950,14 @@ protected static void ensureHealth(Consumer<Request> requestConsumer) throws IOE
     }
 
     protected static void ensureHealth(String index, Consumer<Request> requestConsumer) throws IOException {
-        ensureHealth(client(), index, requestConsumer);
-    }
-
-    protected static void ensureHealth(RestClient client, String index, Consumer<Request> requestConsumer) throws IOException {
         Request request = new Request("GET", "/_cluster/health" + (index.isBlank() ? "" : "/" + index));
         requestConsumer.accept(request);
         try {
-            client.performRequest(request);
+            client().performRequest(request);
         } catch (ResponseException e) {
             if (e.getResponse().getStatusLine().getStatusCode() == HttpStatus.SC_REQUEST_TIMEOUT) {
                 try {
-                    final Response clusterStateResponse = client.performRequest(new Request("GET", "/_cluster/state?pretty"));
+                    final Response clusterStateResponse = client().performRequest(new Request("GET", "/_cluster/state?pretty"));
                     fail("timed out waiting for green state for index [" + index + "] " +
                         "cluster state [" + EntityUtils.toString(clusterStateResponse.getEntity()) + "]");
                 } catch (Exception inner) {

x-pack/plugin/ccr/qa/downgrade-to-basic-license/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexIT.java

@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
 
 import static org.elasticsearch.common.xcontent.ObjectPath.eval;
@@ -49,7 +48,7 @@ public void testDowngradeRemoteClusterToBasic() throws Exception {
         assertBusy(() -> {
             ensureYellow(index1);
             verifyDocuments(index1, 5, "filtered_field:true");
-        }, 60, TimeUnit.SECONDS);
+        });
 
         String index2 = "logs-20190102";
         try (RestClient leaderClient = buildLeaderClient()) {
@@ -89,7 +88,7 @@ public void testDowngradeRemoteClusterToBasic() throws Exception {
                     }
                 });
             }
-        }, 60, TimeUnit.SECONDS);
+        });
 
         // Manually following index2 also does not work after the downgrade:
         Exception e = expectThrows(ResponseException.class, () -> followIndex("leader_cluster", index2));

x-pack/plugin/ccr/qa/src/main/java/org/elasticsearch/xpack/ccr/ESCCRRestTestCase.java

@@ -215,12 +215,14 @@ protected static void ensureYellow(final String index) throws IOException {
     }
 
     protected static void ensureYellow(final String index, final RestClient client) throws IOException {
-        ensureHealth(client, index, request -> {
-            request.addParameter("wait_for_status", "yellow");
-            request.addParameter("wait_for_no_relocating_shards", "true");
-            request.addParameter("timeout", "5s");
-            request.addParameter("level", "shards");
-        });
+        final Request request = new Request("GET", "/_cluster/health/" + index);
+        request.addParameter("wait_for_status", "yellow");
+        request.addParameter("wait_for_active_shards", "1");
+        request.addParameter("wait_for_no_relocating_shards", "true");
+        request.addParameter("wait_for_no_initializing_shards", "true");
+        request.addParameter("timeout", "5s");
+        request.addParameter("level", "shards");
+        client.performRequest(request);
     }
 
     protected int countCcrNodeTasks() throws IOException {