You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2015/05/22 19:09:58 UTC
tez git commit: TEZ-2080. Localclient should be using tezconf in init
instead of yarnconf. (sseth) (cherry picked from commit
269905b112f35b5014d60bacd9d8962c16e2fc8d)
Repository: tez
Updated Branches:
refs/heads/branch-0.6 6e588d151 -> c1d334b4d
TEZ-2080. Localclient should be using tezconf in init instead of
yarnconf. (sseth)
(cherry picked from commit 269905b112f35b5014d60bacd9d8962c16e2fc8d)
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/c1d334b4
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/c1d334b4
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/c1d334b4
Branch: refs/heads/branch-0.6
Commit: c1d334b4dc1766e83658dafffc58e33c2b8e731d
Parents: 6e588d1
Author: Siddharth Seth <ss...@apache.org>
Authored: Wed Feb 18 11:25:41 2015 -0800
Committer: Siddharth Seth <ss...@apache.org>
Committed: Fri May 22 10:09:46 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
tez-dag/src/main/java/org/apache/tez/client/LocalClient.java | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/c1d334b4/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f813f06..27c3429 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -192,6 +192,7 @@ TEZ-UI CHANGES (TEZ-8):
Release 0.5.4: Unreleased
ALL CHANGES:
+ TEZ-2080. Localclient should be using tezconf in init instead of yarnconf.
TEZ-2369. Add a few unit tests for RootInputInitializerManager. Backport a findbugs warning fix from master.
TEZ-2379. org.apache.hadoop.yarn.state.InvalidStateTransitonException:
Invalid event: T_ATTEMPT_KILLED at KILLED.
http://git-wip-us.apache.org/repos/asf/tez/blob/c1d334b4/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 dca9778..c5d9bf1 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
@@ -77,11 +77,11 @@ public class LocalClient extends FrameworkClient {
@Override
public void init(TezConfiguration tezConf, YarnConfiguration yarnConf) {
- this.conf = yarnConf;
+ this.conf = tezConf;
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);
+ this.conf.setBoolean(TezConfiguration.TEZ_IGNORE_LIB_URIS, true);
+ this.conf.set(TezConfiguration.TEZ_AM_DAG_SCHEDULER_CLASS, localModeDAGSchedulerClassName);
isSession = tezConf.getBoolean(TezConfiguration.TEZ_AM_SESSION_MODE,
TezConfiguration.TEZ_AM_SESSION_MODE_DEFAULT);