From e79cf82221a980ba34ee536903d4a2ccc4d4feb5 Mon Sep 17 00:00:00 2001 From: bansvaru Date: Thu, 3 Aug 2023 16:38:21 +0530 Subject: [PATCH] [POC] fix dummy metadata to allow searches on restored indices Signed-off-by: bansvaru --- .../opensearch/snapshots/RestoreService.java | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/server/src/main/java/org/opensearch/snapshots/RestoreService.java b/server/src/main/java/org/opensearch/snapshots/RestoreService.java index 6f61d49daf222..551d892b757d9 100644 --- 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