From 6cff59a7bca0347e532df7e3bf70c3bade3c947d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 19:15:42 +0000
Subject: [PATCH] Fix testIndexDeletionDuringSnapshotCreationInQueue flaky test
 (#11726)

* Fix testIndexDeletionDuringSnapshotCreationInQueue flaky test

Signed-off-by: Suraj Singh <surajrider@gmail.com>

* Update comment

Signed-off-by: Suraj Singh <surajrider@gmail.com>

---------

Signed-off-by: Suraj Singh <surajrider@gmail.com>
(cherry picked from commit 84404689d6259b317c3eaaf94895f369e9920434)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../snapshots/DedicatedClusterSnapshotRestoreIT.java       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/server/src/internalClusterTest/java/org/opensearch/snapshots/DedicatedClusterSnapshotRestoreIT.java b/server/src/internalClusterTest/java/org/opensearch/snapshots/DedicatedClusterSnapshotRestoreIT.java
index 86d5d21adbadd..88e80ab7c0fe9 100644
--- a/server/src/internalClusterTest/java/org/opensearch/snapshots/DedicatedClusterSnapshotRestoreIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/snapshots/DedicatedClusterSnapshotRestoreIT.java
@@ -1497,6 +1497,13 @@ public void testIndexDeletionDuringSnapshotCreationInQueue() throws Exception {
 
         clusterAdmin().prepareRestoreSnapshot("test-repo", "test-snap").get();
         ensureGreen("test-idx");
+
+        // Wait for snapshot process to complete to prevent conflict with repository clean up
+        assertBusy(() -> {
+            SnapshotInfo snapshotInfo = getSnapshot("test-repo", "test-snap-2");
+            assertTrue(snapshotInfo.state().completed());
+            assertEquals(SnapshotState.PARTIAL, snapshotInfo.state());
+        }, 1, TimeUnit.MINUTES);
     }
 
     private long calculateTotalFilesSize(List<Path> files) {