From 1ca219c214d79e9845ef822337e3dd7fe66b47d9 Mon Sep 17 00:00:00 2001
From: Aman Khare <amkhar@amazon.com>
Date: Tue, 27 Feb 2024 13:59:20 +0530
Subject: [PATCH] Exit early when decision map is empty

Signed-off-by: Aman Khare <amkhar@amazon.com>
---
 .../org/opensearch/gateway/BaseGatewayShardAllocator.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/org/opensearch/gateway/BaseGatewayShardAllocator.java b/server/src/main/java/org/opensearch/gateway/BaseGatewayShardAllocator.java
index 0e4ca52d92f8e..8dfa1bf52b2ce 100644
--- a/server/src/main/java/org/opensearch/gateway/BaseGatewayShardAllocator.java
+++ b/server/src/main/java/org/opensearch/gateway/BaseGatewayShardAllocator.java
@@ -102,9 +102,12 @@ public void allocateUnassignedBatch(Set<ShardRouting> shardRoutings, RoutingAllo
                     if (decisionMap.containsKey(shard)) {
                         executeDecision(shard, decisionMap.remove(shard), allocation, iterator);
                     }
+                } else {
+                    // no need to keep iterating the unassigned shards, if we don't have anything in decision map
+                    break;
                 }
             } catch (Exception e) {
-                logger.error("Failed to execute decision for shard {} ", shard, e);
+                logger.error("Failed to execute decision for shard {} while initializing", shard, e);
             }
         }
     }