Repository: tez Updated Branches: refs/heads/branch-0.8 afe9b67f8 -> eaa51be17
TezTaskRunner2 should accept ExecutorService (Contributed by Prasanth Jayachandran) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/eaa51be1 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/eaa51be1 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/eaa51be1 Branch: refs/heads/branch-0.8 Commit: eaa51be17e24d8bc278e5c96acfb1a5c21987584 Parents: afe9b67 Author: Rajesh Balamohan <[email protected]> Authored: Wed May 11 07:32:49 2016 +0530 Committer: Rajesh Balamohan <[email protected]> Committed: Wed May 11 07:32:49 2016 +0530 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../java/org/apache/tez/runtime/task/TezTaskRunner2.java | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/eaa51be1/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b89027e..dbd1f2c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,7 @@ Release 0.8.4: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-3250. TezTaskRunner2 should accept ExecutorService. TEZ-3193. Deadlock in AM during task commit request. TEZ-3203. DAG hangs when one of the upstream vertices has zero tasks TEZ-3219. Allow service plugins to define log locations link for remotely run task attempts. http://git-wip-us.apache.org/repos/asf/tez/blob/eaa51be1/tez-runtime-internals/src/main/java/org/apache/tez/runtime/task/TezTaskRunner2.java ---------------------------------------------------------------------- diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/task/TezTaskRunner2.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/task/TezTaskRunner2.java index 1d619a3..afa08e7 100644 --- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/task/TezTaskRunner2.java +++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/task/TezTaskRunner2.java @@ -19,6 +19,8 @@ import java.nio.ByteBuffer; import java.util.Collection; import java.util.Map; import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; @@ -27,8 +29,6 @@ import java.util.concurrent.locks.ReentrantLock; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.Multimap; -import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.ListeningExecutorService; import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSError; @@ -62,7 +62,7 @@ public class TezTaskRunner2 { private final UserGroupInformation ugi; private final TaskReporterInterface taskReporter; - private final ListeningExecutorService executor; + private final ExecutorService executor; private final UmbilicalAndErrorHandler umbilicalAndErrorHandler; // TODO It may be easier to model this as a state machine. @@ -104,7 +104,7 @@ public class TezTaskRunner2 { Map<String, ByteBuffer> serviceConsumerMetadata, Map<String, String> serviceProviderEnvMap, Multimap<String, String> startedInputsMap, - TaskReporterInterface taskReporter, ListeningExecutorService executor, + TaskReporterInterface taskReporter, ExecutorService executor, ObjectRegistry objectRegistry, String pid, ExecutionContext executionContext, long memAvailable, boolean updateSysCounters, HadoopShim hadoopShim) throws @@ -134,7 +134,7 @@ public class TezTaskRunner2 { */ public TaskRunner2Result run() { try { - ListenableFuture<TaskRunner2CallableResult> future = null; + Future<TaskRunner2CallableResult> future = null; synchronized (this) { // All running state changes must be made within a synchronized block to ensure // kills are issued or the task is not setup.
