From 302ae83b1286e6a8d3d5feb5725e9cea31bbb489 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 3 Aug 2024 08:34:02 +0000
Subject: [PATCH] Fix RemoteCloneIndex flaky test by using sync FS repo
 (#15037)

Signed-off-by: Gaurav Bafna <gbbafna@amazon.com>
(cherry picked from commit 47171f8badbc185e79b175a17376bf3f294516e3)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../action/admin/indices/create/RemoteCloneIndexIT.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/src/internalClusterTest/java/org/opensearch/action/admin/indices/create/RemoteCloneIndexIT.java b/server/src/internalClusterTest/java/org/opensearch/action/admin/indices/create/RemoteCloneIndexIT.java
index acbd68fff6dd0..009f5111078de 100644
--- a/server/src/internalClusterTest/java/org/opensearch/action/admin/indices/create/RemoteCloneIndexIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/action/admin/indices/create/RemoteCloneIndexIT.java
@@ -79,7 +79,7 @@ protected boolean forbidPrivateIndexSettings() {
 
     @Before
     public void setup() {
-        asyncUploadMockFsRepo = true;
+        asyncUploadMockFsRepo = false;
     }
 
     public void testCreateCloneIndex() {
@@ -153,6 +153,7 @@ public void testCreateCloneIndex() {
 
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/15056")
     public void testCreateCloneIndexLowPriorityRateLimit() {
         Version version = VersionUtils.randomIndexCompatibleVersion(random());
         int numPrimaryShards = 1;
@@ -280,7 +281,7 @@ public void testCreateCloneIndexFailure() throws ExecutionException, Interrupted
             throw new RuntimeException(e);
         } finally {
             setFailRate(REPOSITORY_NAME, 0);
-            ensureGreen();
+            ensureGreen(TimeValue.timeValueSeconds(40));
             // clean up
             client().admin()
                 .cluster()