From 8c4ab8e4cd41f6f03d8032aff72cdaaf0fe1c254 Mon Sep 17 00:00:00 2001
From: Tejaskriya <87555809+Tejaskriya@users.noreply.github.com>
Date: Wed, 28 Feb 2024 11:01:17 +0530
Subject: [PATCH] HDDS-8683. Container balancer thread interrupt may not work
 (#6179)

---
 .../hdds/scm/container/balancer/ContainerBalancer.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java
index 7b5cbe9f21f..0e45b131363 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java
@@ -342,10 +342,13 @@ private static void blockTillTaskStop(Thread balancingThread) {
     // NOTE: join should be called outside the lock in hierarchy
     // to avoid locking others waiting
     // wait for balancingThread to die with interrupt
-    balancingThread.interrupt();
     LOG.info("Container Balancer waiting for {} to stop", balancingThread);
     try {
-      balancingThread.join();
+      while (balancingThread.isAlive()) {
+        // retry interrupt every 5ms to avoid waiting when thread is sleeping
+        balancingThread.interrupt();
+        balancingThread.join(5);
+      }
     } catch (InterruptedException exception) {
       Thread.currentThread().interrupt();
     }