tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject tez git commit: TEZ-1928. Tez local mode hang in Pig tez local mode. (hitesh)
Date Mon, 09 Feb 2015 23:06:20 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.5 d7c94da20 -> 8f756802e


TEZ-1928. Tez local mode hang in Pig tez local mode. (hitesh)

(cherry picked from commit 28941dc7fe0df3991dbf20ff4bfe7e0e01ec15f3)

Conflicts:
	tez-dag/src/main/java/org/apache/tez/client/LocalClient.java


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/8f756802
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/8f756802
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/8f756802

Branch: refs/heads/branch-0.5
Commit: 8f756802ee5cae449cf855884bf34ba50861c87d
Parents: d7c94da
Author: Hitesh Shah <hitesh@apache.org>
Authored: Mon Feb 9 15:02:25 2015 -0800
Committer: Hitesh Shah <hitesh@apache.org>
Committed: Mon Feb 9 15:06:10 2015 -0800

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 tez-dag/src/main/java/org/apache/tez/client/LocalClient.java | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/8f756802/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e32ee63..0b20323 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@ Apache Tez Change Log
 Release 0.5.4: Unreleased
 
 ALL CHANGES:
+  TEZ-1928. Tez local mode hang in Pig tez local mode.
   TEZ-1893. Verify invalid -1 parallelism in DAG.verify().
   TEZ-900. Confusing message for incorrect queue for some tez examples.
   TEZ-2036. OneToOneEdgeManager should enforce that source and destination

http://git-wip-us.apache.org/repos/asf/tez/blob/8f756802/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java b/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
index 9848159..1c0c912 100644
--- a/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
+++ b/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
@@ -69,6 +69,8 @@ public class LocalClient extends FrameworkClient {
   private int appIdNumber = 1;
   private boolean isSession;
   private TezApiVersionInfo versionInfo = new TezApiVersionInfo();
+  private static final String localModeDAGSchedulerClassName =
+      "org.apache.tez.dag.app.dag.impl.DAGSchedulerNaturalOrderControlled";
 
   public LocalClient() {
   }
@@ -79,6 +81,7 @@ public class LocalClient extends FrameworkClient {
     tezConf.set("fs.defaultFS", "file:///");
     // Tez libs already in the client's classpath
     tezConf.setBoolean(TezConfiguration.TEZ_IGNORE_LIB_URIS, true);
+    tezConf.set(TezConfiguration.TEZ_AM_DAG_SCHEDULER_CLASS, localModeDAGSchedulerClassName);
     isSession = tezConf.getBoolean(TezConfiguration.TEZ_AM_SESSION_MODE,
         TezConfiguration.TEZ_AM_SESSION_MODE_DEFAULT);
   }


Mime
View raw message