From 92c7ade97b74f21c4257c2112583c4076e72f862 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 05:57:30 +0000
Subject: [PATCH] fix integ test: check for red indices and then manually
 restore to green (#10838)

Signed-off-by: bansvaru <bansvaru@amazon.com>
(cherry picked from commit 5e7c0689534f94b5f09f85eb0a64b42f79899241)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../remotestore/RemoteStoreClusterStateRestoreIT.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreClusterStateRestoreIT.java b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreClusterStateRestoreIT.java
index 29786158bc73c..c429b587a1399 100644
--- a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreClusterStateRestoreIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreClusterStateRestoreIT.java
@@ -111,7 +111,7 @@ public void testFullClusterRestore() throws Exception {
      * 8. Add data nodes to recover index data
      * 9. Verify Metadata and index data is restored.
      */
-    public void testFullClusterStateRestore() throws Exception {
+    public void testFullClusterRestoreDoesntFailWithConflictingLocalState() throws Exception {
         int shardCount = randomIntBetween(1, 2);
         int replicaCount = 1;
         int dataNodeCount = shardCount * (replicaCount + 1);
@@ -159,7 +159,7 @@ public Settings onNodeStopped(String nodeName) {
 
         // start data nodes to trigger index data recovery
         internalCluster().startDataOnlyNodes(dataNodeCount);
-        verifyRestoredData(indexStats, INDEX_NAME);
+        verifyRedIndicesAndTriggerRestore(indexStats, INDEX_NAME, true);
     }
 
     public void testFullClusterRestoreMultipleIndices() throws Exception {