From bff3dabc9591811032481a71d9eba8c97dd887df Mon Sep 17 00:00:00 2001
From: Aman Khare <amkhar@amazon.com>
Date: Wed, 13 Mar 2024 12:42:04 +0530
Subject: [PATCH] Modify existing transport and helper class to accomodate new
 handling

Signed-off-by: Aman Khare <amkhar@amazon.com>
---
 .../TransportNodesListShardStoreMetadata.java    | 16 +---------------
 ...ansportNodesListShardStoreMetadataHelper.java |  4 ++--
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java b/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java
index 7d78fae762330..eeee5d8a409aa 100644
--- a/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java
+++ b/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java
@@ -52,7 +52,6 @@
 import org.opensearch.core.index.shard.ShardId;
 import org.opensearch.env.NodeEnvironment;
 import org.opensearch.gateway.AsyncShardFetch;
-import org.opensearch.index.store.Store;
 import org.opensearch.indices.IndicesService;
 import org.opensearch.indices.store.TransportNodesListShardStoreMetadataHelper.StoreFilesMetadata;
 import org.opensearch.threadpool.ThreadPool;
@@ -60,7 +59,6 @@
 import org.opensearch.transport.TransportService;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -157,19 +155,7 @@ protected NodeStoreFilesMetadata nodeOperation(NodeRequest request) {
 
     private StoreFilesMetadata listStoreMetadata(NodeRequest request) throws IOException {
         final ShardId shardId = request.getShardId();
-        try {
-            return listShardMetadataInternal(
-                logger,
-                shardId,
-                nodeEnv,
-                indicesService,
-                request.getCustomDataPath(),
-                settings,
-                clusterService
-            );
-        } catch (IOException e) {
-            return new StoreFilesMetadata(shardId, Store.MetadataSnapshot.EMPTY, Collections.emptyList());
-        }
+        return listShardMetadataInternal(logger, shardId, nodeEnv, indicesService, request.getCustomDataPath(), settings, clusterService);
     }
 
     /**
diff --git a/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadataHelper.java b/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadataHelper.java
index e89f627c29ff1..74b04d6c6d494 100644
--- a/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadataHelper.java
+++ b/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadataHelper.java
@@ -78,10 +78,10 @@ public static StoreFilesMetadata listShardMetadataInternal(
                         return storeFilesMetadata;
                     } catch (org.apache.lucene.index.IndexNotFoundException e) {
                         logger.trace(new ParameterizedMessage("[{}] node is missing index, responding with empty", shardId), e);
-                        throw e;
+                        return new StoreFilesMetadata(shardId, Store.MetadataSnapshot.EMPTY, Collections.emptyList());
                     } catch (IOException e) {
                         logger.warn(new ParameterizedMessage("[{}] can't read metadata from store, responding with empty", shardId), e);
-                        throw e;
+                        return new StoreFilesMetadata(shardId, Store.MetadataSnapshot.EMPTY, Collections.emptyList());
                     }
                 }
             }