Minor change

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>
opensearch-project · Sep 2, 2024 · edc02b0 · edc02b0
1 parent a8717d9
commit edc02b0
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/server/src/main/java/org/opensearch/gateway/ShardsBatchGatewayAllocator.java b/server/src/main/java/org/opensearch/gateway/ShardsBatchGatewayAllocator.java
@@ -290,9 +290,8 @@ public void onTimeout() {
                     @Override
                     public void run() {
                         primaryBatchShardAllocator.allocateUnassignedBatch(shardsBatch.getBatchedShardRoutings(), allocation);
-                        if (timedOutPrimaryShardIds.isEmpty() == false) {
+                        if (timedOutPrimaryShardIds.isEmpty() == false && rerouteService != null) {
                             logger.trace("scheduling reroute after existing shards allocator timed out for primary shards");
-                            assert rerouteService != null;
                             rerouteService.reroute(
                                 "reroute after existing shards allocator timed out",
                                 Priority.HIGH,
@@ -332,9 +331,8 @@ public void run() {
                 public void onComplete() {
                     logger.trace("Triggering oncomplete after timeout for [{}] replica shards", timedOutReplicaShardIds.size());
                     replicaBatchShardAllocator.allocateUnassignedBatchOnTimeout(timedOutReplicaShardIds, allocation, false);
-                    if (timedOutReplicaShardIds.isEmpty() == false) {
+                    if (timedOutReplicaShardIds.isEmpty() == false && rerouteService != null) {
                         logger.trace("scheduling reroute after existing shards allocator timed out for replica shards");
-                        assert rerouteService != null;
                         rerouteService.reroute(
                             "reroute after existing shards allocator timed out",
                             Priority.HIGH,