Repository: tez Updated Branches: refs/heads/master c38d3127a -> d3191bd39
TEZ-1365. Local mode should ignore tez.lib.uris, and set a config for the AM to be aware of session mode. (sseth) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/d3191bd3 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/d3191bd3 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/d3191bd3 Branch: refs/heads/master Commit: d3191bd39d2a06166c43e2fd103e2add8e4dfa91 Parents: c38d312 Author: Siddharth Seth <[email protected]> Authored: Fri Aug 1 18:58:01 2014 -0700 Committer: Siddharth Seth <[email protected]> Committed: Fri Aug 1 18:58:01 2014 -0700 ---------------------------------------------------------------------- tez-api/src/main/java/org/apache/tez/client/TezClient.java | 2 ++ tez-dag/src/main/java/org/apache/tez/client/LocalClient.java | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/d3191bd3/tez-api/src/main/java/org/apache/tez/client/TezClient.java ---------------------------------------------------------------------- diff --git a/tez-api/src/main/java/org/apache/tez/client/TezClient.java b/tez-api/src/main/java/org/apache/tez/client/TezClient.java index ea401b8..6cbdd6d 100644 --- a/tez-api/src/main/java/org/apache/tez/client/TezClient.java +++ b/tez-api/src/main/java/org/apache/tez/client/TezClient.java @@ -176,6 +176,8 @@ public class TezClient { @Nullable Credentials credentials) { this.clientName = name; this.isSession = isSession; + // Set in conf for local mode AM to figure out whether in session mode or not + tezConf.setBoolean(TezConfiguration.TEZ_AM_SESSION_MODE, isSession); this.amConfig = new AMConfiguration(tezConf, localResources, credentials); } http://git-wip-us.apache.org/repos/asf/tez/blob/d3191bd3/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 5a379c3..1a86a2b 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 @@ -71,6 +71,8 @@ public class LocalClient extends FrameworkClient { public void init(Configuration conf) { this.conf = conf; this.conf.set("fs.defaultFS", "file:///"); + // Tez libs already in the client's classpath + this.conf.setBoolean(TezConfiguration.TEZ_IGNORE_LIB_URIS, true); isSession = conf.getBoolean(TezConfiguration.TEZ_AM_SESSION_MODE, TezConfiguration.TEZ_AM_SESSION_MODE_DEFAULT); }
