Create empty index if remote segment store is empty (#6375)

Signed-off-by: Sachin Kale <kalsac@amazon.com>
opensearch-project · Feb 20, 2023 · 1904158 · 1904158
1 parent 5b3b557
commit 1904158
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreIT.java b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreIT.java
@@ -175,7 +175,6 @@ private void testRestoreFlow(boolean remoteTranslog, int numberOfIterations, boo
         }
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/6291")
     public void testRemoteSegmentStoreRestoreWithNoDataPostCommit() throws IOException {
         testRestoreFlow(false, 1, true);
     }

diff --git a/server/src/main/java/org/opensearch/index/shard/StoreRecovery.java b/server/src/main/java/org/opensearch/index/shard/StoreRecovery.java
@@ -457,6 +457,9 @@ private void recoverFromRemoteStore(IndexShard indexShard, Repository repository
             // Download segments from remote segment store
             indexShard.syncSegmentsFromRemoteSegmentStore(true);
 
+            if (store.directory().listAll().length == 0) {
+                store.createEmpty(indexShard.indexSettings().getIndexVersionCreated().luceneVersion);
+            }
             if (repository != null) {
                 syncTranslogFilesFromRemoteTranslog(indexShard, repository);
             } else {