TEZ-4270: HeartbeatHandlerBase Does Not Need Stop Condition (#93) (Da…

…vid Mollitor reviewed by Laszlo Bodor)
apache · Dec 26, 2021 · c9b8e90 · c9b8e90
1 parent 8f846dc
commit c9b8e90
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/HeartbeatHandlerBase.java b/tez-dag/src/main/java/org/apache/tez/dag/app/HeartbeatHandlerBase.java
@@ -42,7 +42,6 @@ public abstract class HeartbeatHandlerBase<T> extends AbstractService {
   protected final AppContext appContext;
 
   private ConcurrentMap<T, ReportTime> runningMap;
-  private volatile boolean stopped;
 
   public HeartbeatHandlerBase(AppContext appContext, int expectedConcurrency, String name) {
     super(name);
@@ -70,7 +69,6 @@ public void serviceStart() {
 
   @Override
   public void serviceStop() {
-    stopped = true;
     if (timeOutCheckerThread != null) {
       timeOutCheckerThread.interrupt();
     }
@@ -140,7 +138,7 @@ private class PingChecker implements Runnable {
 
     @Override
     public void run() {
-      while (!stopped && !Thread.currentThread().isInterrupted()) {
+      while (!Thread.currentThread().isInterrupted()) {
         Iterator<Map.Entry<T, ReportTime>> iterator =
             runningMap.entrySet().iterator();
 
@@ -158,7 +156,7 @@ public void run() {
         try {
           Thread.sleep(timeOutCheckInterval);
         } catch (InterruptedException e) {
-          break;
+          Thread.currentThread().interrupt();
         }
       }
     }