Changing logic to fetch Index shard from shardId

Signed-off-by: Sagar Upadhyaya <[email protected]>
opensearch-project · Jan 10, 2024 · b6e2c4a · b6e2c4a
1 parent 0850e11
commit b6e2c4a
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/server/src/main/java/org/opensearch/indices/IndicesService.java b/server/src/main/java/org/opensearch/indices/IndicesService.java
@@ -410,10 +410,8 @@ public IndicesService(
         this.analysisRegistry = analysisRegistry;
         this.indexNameExpressionResolver = indexNameExpressionResolver;
         this.indicesRequestCache = new IndicesRequestCache(settings, (shardId -> {
-            IndexService indexService = null;
-            try {
-                indexService = indexServiceSafe(shardId.getIndex());
-            } catch (IndexNotFoundException ex) {
+            IndexService indexService = this.indices.get(shardId.getIndex().getUUID());
+            if (indexService == null) {
                 return Optional.empty();
             }
             return Optional.of(new IndexShardCacheEntity(indexService.getShard(shardId.id())));