commit 1fba8f71a0f496e1fcb67a223fb32b389bdfb2e0
author László Bodor <bodorlaszlo0202@gmail.com> Tue Sep 08 18:43:23 2020 +0200
committer Laszlo Bodor <bodorlaszlo0202@gmail.com> Tue Sep 08 18:43:23 2020 +0200
tree e07a2d028164f5ac93218e66857cdfa6deeaa7cf
parent 79048f9e44cc41154a3d741090053a0b0e6f21b0

TEZ-4230: LocalContainerLauncher can kill task future too early, causing app hang (László Bodor reviewed by Jonathan Turner Eagles)

Signed-off-by: Laszlo Bodor <bodorlaszlo0202@gmail.com>

tez-dag/src/main/java/org/apache/tez/dag/app/launcher/LocalContainerLauncher.java

diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/LocalContainerLauncher.java b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/LocalContainerLauncher.java
index a63ce3f..ae30809 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/LocalContainerLauncher.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/LocalContainerLauncher.java
@@ -299,10 +299,11 @@
     if (future == null) {
       LOG.info("Ignoring stop request for containerId: " + event.getContainerId());
     } else {
-      LOG.info(
-          "Stopping containerId: {}",
-          event.getContainerId());
-      future.cancel(true);
+      LOG.info("Stopping containerId: {}, isDone: {}", event.getContainerId(),
+          future.isDone());
+      future.cancel(false);
+      LOG.debug("Stopped containerId: {}, isCancelled: {}", event.getContainerId(),
+          future.isCancelled());
     }
     // Send this event to maintain regular control flow. This isn't of much use though.
     getContext().containerStopRequested(event.getContainerId());