[POC] fix dummy metadata to allow searches on restored indices

Signed-off-by: bansvaru <bansvaru@amazon.com>
opensearch-project · Aug 3, 2023 · e79cf82 · e79cf82
1 parent d192f2d
commit e79cf82
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/server/src/main/java/org/opensearch/snapshots/RestoreService.java b/server/src/main/java/org/opensearch/snapshots/RestoreService.java
@@ -94,6 +94,7 @@
 import org.opensearch.repositories.Repository;
 import org.opensearch.repositories.RepositoryData;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -212,19 +213,24 @@ public void restoreFromRemoteStore(RestoreRemoteStoreRequest request, final Acti
 
             private IndexMetadata getRemoteIndexMetadata() {
                 // Dummy data for initial testing
-                return IndexMetadata.builder("my-index-01")
-                    .settings(Settings.builder()
-                        .put(SETTING_INDEX_UUID, "TLHafcwfTAazM5hFSFidyA")
-                        .put(SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT)
-                        .put(SETTING_REMOTE_STORE_ENABLED, true)
-                        .put(SETTING_REMOTE_SEGMENT_STORE_REPOSITORY, "my-fs-repository")
-                        .put(SETTING_REMOTE_TRANSLOG_STORE_REPOSITORY, "my-fs-repository")
-                        .put(SETTING_NUMBER_OF_SHARDS, 1)
-                        .put(SETTING_NUMBER_OF_REPLICAS, 0)
-                        .put(SETTING_VERSION_CREATED, "137217827")
-                    )
-                    .primaryTerm(0, 2)
-                    .build();
+                try {
+                    return IndexMetadata.builder("my-index-01")
+                        .settings(Settings.builder()
+                            .put(SETTING_INDEX_UUID, "TLHafcwfTAazM5hFSFidyA")
+                            .put(SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT)
+                            .put(SETTING_REMOTE_STORE_ENABLED, true)
+                            .put(SETTING_REMOTE_SEGMENT_STORE_REPOSITORY, "my-fs-repository")
+                            .put(SETTING_REMOTE_TRANSLOG_STORE_REPOSITORY, "my-fs-repository")
+                            .put(SETTING_NUMBER_OF_SHARDS, 1)
+                            .put(SETTING_NUMBER_OF_REPLICAS, 0)
+                            .put(SETTING_VERSION_CREATED, "137217827")
+                        )
+                        .primaryTerm(0, 2)
+                        .putMapping("{\"_doc\":{\"properties\":{\"settings\":{\"properties\":{\"index\":{\"properties\":{\"number_of_replicas\":{\"type\":\"long\"},\"number_of_shards\":{\"type\":\"long\"},\"remote_store\":{\"properties\":{\"enabled\":{\"type\":\"boolean\"},\"repository\":{\"type\":\"text\",\"fields\":{\"keyword\":{\"type\":\"keyword\",\"ignore_above\":256}}},\"translog\":{\"properties\":{\"buffer_interval\":{\"type\":\"text\",\"fields\":{\"keyword\":{\"type\":\"keyword\",\"ignore_above\":256}}},\"enabled\":{\"type\":\"boolean\"},\"repository\":{\"type\":\"text\",\"fields\":{\"keyword\":{\"type\":\"keyword\",\"ignore_above\":256}}}}}}},\"replication\":{\"properties\":{\"type\":{\"type\":\"text\",\"fields\":{\"keyword\":{\"type\":\"keyword\",\"ignore_above\":256}}}}}}}}}}}}")
+                        .build();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
             }
 
             private boolean isIndexMetadataFromRemoteStore(IndexMetadata indexMetadata){
@@ -291,7 +297,7 @@ private ClusterState executeRestore(ClusterState currentState, Map<String, Index
                             .settingsVersion(1 + indexMetadata.getSettingsVersion())
                             .aliasesVersion(1 + indexMetadata.getAliasesVersion())
                             .build();
-                    } else {
+                    } else if (isIndexMetadataFromRemoteStore(indexMetadata) == false) {
                         activeInitializingShards = currentState.routingTable()
                             .index(indexName)
                             .shards()