Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 10925187FD for ; Tue, 21 Jul 2015 01:02:33 +0000 (UTC) Received: (qmail 46856 invoked by uid 500); 21 Jul 2015 01:02:33 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 46828 invoked by uid 500); 21 Jul 2015 01:02:33 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 46819 invoked by uid 99); 21 Jul 2015 01:02:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jul 2015 01:02:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D57A3E051A; Tue, 21 Jul 2015 01:02:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: smohanty@apache.org To: commits@ambari.apache.org Message-Id: <5f386d182a3a4204a0296fa84eb5d39b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-12457. HDP-2.2 deployment of webhcat should use /etc/tez/conf Date: Tue, 21 Jul 2015 01:02:32 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/branch-2.1 751b0cbe2 -> ec2bbdd1e AMBARI-12457. HDP-2.2 deployment of webhcat should use /etc/tez/conf Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ec2bbdd1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ec2bbdd1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ec2bbdd1 Branch: refs/heads/branch-2.1 Commit: ec2bbdd1ed4506976626a14896a872e7b1242b53 Parents: 751b0cb Author: Sumit Mohanty Authored: Mon Jul 20 17:59:48 2015 -0700 Committer: Sumit Mohanty Committed: Mon Jul 20 18:01:11 2015 -0700 ---------------------------------------------------------------------- .../2.2/services/HIVE/configuration/webhcat-site.xml | 2 +- .../2.3/services/HIVE/configuration/webhcat-site.xml | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ec2bbdd1/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml index f3a9ec0..49563de 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml @@ -111,7 +111,7 @@ limitations under the License. templeton.hive.extra.files - /usr/hdp/${hdp.version}/tez/conf/tez-site.xml,/usr/hdp/${hdp.version}/tez,/usr/hdp/${hdp.version}/tez/lib + /etc/tez/conf/tez-site.xml,/usr/hdp/${hdp.version}/tez,/usr/hdp/${hdp.version}/tez/lib The resources in this list will be localized to the node running LaunchMapper and added to HADOOP_CLASSPTH before launching 'hive' command. If the path /foo/bar is a directory, the contents of the the entire dir will be localized and ./foo/* will be added to HADOOP_CLASSPATH. Note that since classpath path processing does not recurse into subdirectories, http://git-wip-us.apache.org/repos/asf/ambari/blob/ec2bbdd1/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/webhcat-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/webhcat-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/webhcat-site.xml index 62ef899..d3962d2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/webhcat-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/webhcat-site.xml @@ -29,4 +29,18 @@ limitations under the License. Jars to add the the classpath. + + templeton.hive.extra.files + /usr/hdp/${hdp.version}/tez/conf/tez-site.xml,/usr/hdp/${hdp.version}/tez,/usr/hdp/${hdp.version}/tez/lib + The resources in this list will be localized to the node running LaunchMapper and added to HADOOP_CLASSPTH + before launching 'hive' command. If the path /foo/bar is a directory, the contents of the the entire dir will be localized + and ./foo/* will be added to HADOOP_CLASSPATH. Note that since classpath path processing does not recurse into subdirectories, + the paths in this property may be overlapping. In the example above, "./tez-site.xml:./tez-client/*:./lib/*" will be added to + HADOOP_CLASSPATH. + This can be used to specify config files, Tez artifacts, etc. This will be sent -files option of hadoop jar command thus + each path is interpreted by Generic Option Parser. It can be local or hdfs path. + + + +