Open the index to be restored as part of restore flow

Signed-off-by: Sachin Kale <[email protected]>

Author: Sachin Kale

server/src/main/java/org/opensearch/index/IndexService.java

@@ -514,13 +514,7 @@ public synchronized IndexShard createShard(
                     this.indexSettings,
                     path
                 );
-                remoteStore = new Store(
-                    shardId,
-                    this.indexSettings,
-                    remoteDirectory,
-                    lock,
-                    new StoreCloseListener(shardId, () -> eventListener.onStoreClosed(shardId))
-                );
+                remoteStore = new Store(shardId, this.indexSettings, remoteDirectory, lock, Store.OnClose.EMPTY);
             }
 
             Directory directory = directoryFactory.newDirectory(this.indexSettings, path);

server/src/main/java/org/opensearch/snapshots/RestoreService.java

@@ -227,25 +227,35 @@ public ClusterState execute(ClusterState currentState) {
                         logger.warn("Remote store restore is not supported for non-existent index. Skipping: {}", index);
                         continue;
                     }
-                    if (currentIndexMetadata.getState() != IndexMetadata.State.CLOSE) {
-                        throw new IllegalStateException(
-                            "cannot restore index ["
-                                + index
-                                + "] because an open index "
-                                + "with same name already exists in the cluster. Close the existing index"
-                        );
-                    }
                     if (currentIndexMetadata.getSettings().getAsBoolean(SETTING_REMOTE_STORE, false)) {
-                        IndexId indexId = new IndexId(index, currentIndexMetadata.getIndexUUID());
+                        if (currentIndexMetadata.getState() != IndexMetadata.State.CLOSE) {
+                            throw new IllegalStateException(
+                                "cannot restore index ["
+                                    + index
+                                    + "] because an open index "
+                                    + "with same name already exists in the cluster. Close the existing index"
+                            );
+                        }
+                        IndexMetadata updatedIndexMetadata = IndexMetadata.builder(currentIndexMetadata)
+                            .state(IndexMetadata.State.OPEN)
+                            .version(1 + currentIndexMetadata.getVersion())
+                            .mappingVersion(1 + currentIndexMetadata.getMappingVersion())
+                            .settingsVersion(1 + currentIndexMetadata.getSettingsVersion())
+                            .aliasesVersion(1 + currentIndexMetadata.getAliasesVersion())
+                            .build();
+
+                        IndexId indexId = new IndexId(index, updatedIndexMetadata.getIndexUUID());
 
                         RemoteStoreRecoverySource recoverySource = new RemoteStoreRecoverySource(
                             restoreUUID,
-                            currentIndexMetadata.getCreationVersion(),
+                            updatedIndexMetadata.getCreationVersion(),
                             indexId
                         );
-                        rtBuilder.addAsRemoteStoreRestore(currentIndexMetadata, recoverySource);
+                        rtBuilder.addAsRemoteStoreRestore(updatedIndexMetadata, recoverySource);
+                        blocks.updateBlocks(updatedIndexMetadata);
+                        mdBuilder.put(updatedIndexMetadata, true);
                         indicesToBeRestored.add(index);
-                        totalShards += currentIndexMetadata.getNumberOfShards();
+                        totalShards += updatedIndexMetadata.getNumberOfShards();
                     } else {
                         logger.warn("Remote store is not enabled for index: {}", index);
                     }

server/src/test/java/org/opensearch/index/shard/IndexShardTests.java

@@ -44,6 +44,7 @@
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FilterDirectory;
 import org.apache.lucene.store.IOContext;
+import org.apache.lucene.tests.mockfile.ExtrasFS;
 import org.apache.lucene.tests.store.BaseDirectoryWrapper;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.Constants;
@@ -2691,8 +2692,10 @@ public void testRestoreShardFromRemoteStore() throws IOException {
         Directory remoteDirectory = ((FilterDirectory) ((FilterDirectory) target.remoteStore().directory()).getDelegate()).getDelegate();
         ((BaseDirectoryWrapper) remoteDirectory).setCheckIndexOnClose(false);
 
+        // extra0 file is added as a part of https://lucene.apache.org/core/7_2_1/test-framework/org/apache/lucene/mockfile/ExtrasFS.html
+        // Safe to remove without impacting the test
         for (String file : remoteDirectory.listAll()) {
-            if (file.equals("extra0")) {
+            if (ExtrasFS.isExtra(file)) {
                 remoteDirectory.deleteFile(file);
             }
         }