retry interrupt in blockTillTaskStop

Tejaskriya · Feb 23, 2024 · 05cff9a · 05cff9a
1 parent ac3fa89
commit 05cff9a
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/...er-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java b/...er-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java
@@ -352,13 +352,15 @@ 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
-    LOG.info("In blockTillTaskStop before interrupt, currentThread: {} isInterrupted:{}, balancingThread: {}, isInterrupted:{}",
-        Thread.currentThread(), Thread.currentThread().isInterrupted(), balancingThread, balancingThread.isInterrupted());
-    balancingThread.interrupt();
-    LOG.info("Container Balancer {} isInterrupted {},  waiting for balancing thread {} to stop, isInterrupted: {}",
-        Thread.currentThread(), Thread.currentThread().isInterrupted(), balancingThread, balancingThread.isInterrupted());
     try {
-      balancingThread.join();
+      LOG.info("In blockTillTaskStop before interrupt, currentThread: {} isInterrupted:{}, balancingThread: {}, isInterrupted:{}",
+          Thread.currentThread(), Thread.currentThread().isInterrupted(), balancingThread, balancingThread.isInterrupted());
+      /*LOG.info("Container Balancer {} isInterrupted {}, waiting for balancing thread {} to stop, isInterrupted: {}",
+          Thread.currentThread(), Thread.currentThread().isInterrupted(), balancingThread, balancingThread.isInterrupted());*/
+      while (balancingThread.isAlive()) {
+        balancingThread.interrupt();
+        balancingThread.join(5);
+      }
     } catch (InterruptedException exception) {
       LOG.info("In Catch of blockTaskTillStop, interrupting currentThread: {}", Thread.currentThread());
       Thread.currentThread().interrupt();