Remove time check. Just we will schedule

Signed-off-by: pranikum <109206473+pranikum@users.noreply.github.com>
opensearch-project · Sep 27, 2022 · 7922291 · 7922291
1 parent ed1ccbc
commit 7922291
Showing 1 changed file with 9 additions and 25 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/decommission/DecommissionController.java b/server/src/main/java/org/opensearch/cluster/decommission/DecommissionController.java
@@ -338,14 +338,15 @@ void handleNodesDecommissionRequest(
         TimeValue timeoutForNodeDraining,
         ActionListener<Void> listener
     ) {
-
-        if (timeoutForNodeDraining.getSeconds() > 0) {
-            // Wait for timeout to happen. Log the active connection before decommissioning of nodes.
-            scheduleDecommissionNodesRequestCheck(decommissionedNodes, reason, timeout, listener, timeoutForNodeDraining);
-        } else {
-            getActiveRequestCountOnDecommissionNodes(decommissionedNodes);
-            removeDecommissionedNodes(decommissionedNodes, reason, timeout, listener);
-        }
+        // Wait for timeout to happen. Log the active connection before decommissioning of nodes.
+        transportService.getThreadPool().schedule(new Runnable() {
+            @Override
+            public void run() {
+                // Check for active connections.
+                getActiveRequestCountOnDecommissionNodes(decommissionedNodes);
+                removeDecommissionedNodes(decommissionedNodes, reason, timeout, listener);
+            }
+        }, timeoutForNodeDraining, org.opensearch.threadpool.ThreadPool.Names.SAME);
     }
 
     private void logActiveConnections(NodesStatsResponse nodesStatsResponse) {
@@ -359,23 +360,6 @@ private void logActiveConnections(NodesStatsResponse nodesStatsResponse) {
         logger.info("Decommissioning node with connections : [{}]", nodeActiveConnectionMap);
     }
 
-    private void scheduleDecommissionNodesRequestCheck(
-        Set<DiscoveryNode> decommissionedNodes,
-        String reason,
-        TimeValue timeout,
-        ActionListener<Void> nodesRemovedListener,
-        TimeValue timeoutForNodeDraining
-    ) {
-        transportService.getThreadPool().schedule(new Runnable() {
-            @Override
-            public void run() {
-                // Check for active connections.
-                getActiveRequestCountOnDecommissionNodes(decommissionedNodes);
-                removeDecommissionedNodes(decommissionedNodes, reason, timeout, nodesRemovedListener);
-            }
-        }, timeoutForNodeDraining, org.opensearch.threadpool.ThreadPool.Names.SAME);
-    }
-
     private void getActiveRequestCountOnDecommissionNodes(Set<DiscoveryNode> decommissionedNodes) {
         if (decommissionedNodes == null || decommissionedNodes.isEmpty()) {
             return;