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

[abstractdog]

This is an automated email from the ASF dual-hosted git repository.

abstractdog pushed a commit to branch branch-0.10.0
in repository https://gitbox.apache.org/repos/asf/tez.git


The following commit(s) were added to refs/heads/branch-0.10.0 by this push:
     new d238989  TEZ-4230: LocalContainerLauncher can kill task future too 
early, causing app hang (László Bodor reviewed by Jonathan Turner Eagles)
d238989 is described below

commit d2389896c4a41ce4f6f27cb0dac40ea941b75374
Author: László Bodor <bodorlaszlo0...@gmail.com>
AuthorDate: Tue Sep 8 18:43:23 2020 +0200

    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 <bodorlaszlo0...@gmail.com>
---
 .../org/apache/tez/dag/app/launcher/LocalContainerLauncher.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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 @@ public class LocalContainerLauncher extends 
DagContainerLauncher {
     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());