tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rbalamo...@apache.org
Subject tez git commit: TezTaskRunner2 should accept ExecutorService (Contributed by Prasanth Jayachandran)
Date Wed, 11 May 2016 02:37:27 GMT
Repository: tez
Updated Branches:
  refs/heads/master 50ea2ded9 -> 69b8e0644


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/69b8e064
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/69b8e064
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/69b8e064

Branch: refs/heads/master
Commit: 69b8e064416e5ea61cbfe298d38b34ecb99b1e27
Parents: 50ea2de
Author: Rajesh Balamohan <rbalamohan@apache.org>
Authored: Wed May 11 07:31:09 2016 +0530
Committer: Rajesh Balamohan <rbalamohan@apache.org>
Committed: Wed May 11 07:34:54 2016 +0530

----------------------------------------------------------------------
 CHANGES.txt                                               |  3 +++
 .../java/org/apache/tez/runtime/task/TezTaskRunner2.java  | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/69b8e064/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index cd7f4ce..ae48db1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@ Release 0.9.0: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+
+  TEZ-3250. TezTaskRunner2 should accept ExecutorService.
   TEZ-3245. Data race between addKnowInput and clearAndGetOnepartition of InputHost.
   TEZ-3193. Deadlock in AM during task commit request.
   TEZ-3203. DAG hangs when one of the upstream vertices has zero tasks
@@ -30,6 +32,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/69b8e064/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.


Mime
View raw message