Repository: hive Updated Branches: refs/heads/master fbdd526e2 -> 6051835bb
HIVE-13077: LLAP: Scrub daemon-site.xml from client configs (Gopal V, reviewed by Siddharth Seth) Signed-off-by: Gopal V <gop...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/675fa32a Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/675fa32a Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/675fa32a Branch: refs/heads/master Commit: 675fa32a01850226962a4c1d66658547ea498965 Parents: fbdd526 Author: Gopal V <gop...@apache.org> Authored: Thu Feb 18 22:59:20 2016 -0800 Committer: Gopal V <gop...@apache.org> Committed: Thu Feb 18 22:59:20 2016 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/675fa32a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java index 6a7d035..5f9235b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java @@ -250,10 +250,7 @@ public class TezSessionState { } if (llapMode) { - // add configs for llap-daemon-site.xml + localize llap jars - // they cannot be referred to directly as it would be a circular depedency - conf.addResource("llap-daemon-site.xml"); - + // localize llap client jars addJarLRByClass(LlapTaskSchedulerService.class, commonLocalResources); addJarLRByClass(LlapProtocolClientImpl.class, commonLocalResources); addJarLRByClass(LlapProtocolClientProxy.class, commonLocalResources);