Fixed bugs

1. updating shard routing in batches in accordance with previous behaviour 2. Closing of AsyncShardFetch in cleanCaches() 3. Updated in getNumberOfInflightFetches for batch maps 4. Renamed variable names Signed-off-by: Gaurav Chandani <[email protected]>
Gaurav614 · Sep 6, 2023 · b9407cc · b9407cc
1 parent f4b32b2
commit b9407cc
Show file tree

Hide file tree

Showing 6 changed files with 168 additions and 106 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/AllocationService.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/AllocationService.java
@@ -568,7 +568,7 @@ private void allocateExistingUnassignedShards(RoutingAllocation allocation) {
             }
         }
     }
-    
+
     private void disassociateDeadNodes(RoutingAllocation allocation) {
         for (Iterator<RoutingNode> it = allocation.routingNodes().mutableIterator(); it.hasNext();) {
             RoutingNode node = it.next();

diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/ExistingShardsAllocator.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/ExistingShardsAllocator.java
@@ -80,7 +80,7 @@ void allocateUnassigned(
         UnassignedAllocationHandler unassignedAllocationHandler
     );
 
-    default void allocateUnassignedBatch(RoutingAllocation allocation, boolean primary){
+    default void allocateUnassignedBatch(RoutingAllocation allocation, boolean primary) {
         RoutingNodes.UnassignedShards.UnassignedIterator iterator = allocation.routingNodes().unassigned().iterator();
         while (iterator.hasNext()) {
             ShardRouting shardRouting = iterator.next();

diff --git a/server/src/main/java/org/opensearch/gateway/BaseGatewayShardAllocator.java b/server/src/main/java/org/opensearch/gateway/BaseGatewayShardAllocator.java
@@ -92,8 +92,7 @@ public void allocateUnassigned(
         }
     }
 
-    public void allocateUnassignedBatch(String batchId, RoutingAllocation allocation){
-    }
+    public void allocateUnassignedBatch(String batchId, RoutingAllocation allocation) {}
 
     protected long getExpectedShardSize(ShardRouting shardRouting, RoutingAllocation allocation) {
         if (shardRouting.primary()) {