diff --git a/server/src/main/java/org/opensearch/cluster/decommission/DecommissionController.java b/server/src/main/java/org/opensearch/cluster/decommission/DecommissionController.java index 9aaccbc816761..9686ebff31ab9 100644 --- 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 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 decommissionedNodes, - String reason, - TimeValue timeout, - ActionListener 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 decommissionedNodes) { if (decommissionedNodes == null || decommissionedNodes.isEmpty()) { return;