Repository: ambari Updated Branches: refs/heads/trunk dbf3c65c6 -> b13eca9a5
AMBARI-17229. Add config 'tez.lib.uris' in tez_hive2/tez-site's pointing to tez_hive2 path jar. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b13eca9a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b13eca9a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b13eca9a Branch: refs/heads/trunk Commit: b13eca9a5405867045d91d34f661883fb50910f9 Parents: dbf3c65 Author: Swapan Shridhar <[email protected]> Authored: Tue Jun 14 14:03:52 2016 -0700 Committer: Swapan Shridhar <[email protected]> Committed: Tue Jun 14 16:05:01 2016 -0700 ---------------------------------------------------------------------- .../HIVE/configuration/hive-interactive-site.xml | 15 +++++++++++++-- .../HIVE/configuration/tez-interactive-site.xml | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b13eca9a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml index eb4aa61..1b2eaf5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml @@ -17,6 +17,17 @@ See the License for the specific language governing permissions and limitations under the License. --> <configuration supports_final="true"> + <!-- + Note: This file includes only those configs which are supposed to have different value from the parent hive/hive-site. + It inherits the other required configs from hive/hive-site. + The inheritance logic in order to get hive2/hive-site goes like this : + + 1. We read the hive/hive-site which includes the stack defaults and Stack Advisor recommended values. + 2. We take the read hive/hive-site (step 1), and on top of it apply the hive-interactive-site to get + hive2/hive-site. + + Therefore, any config defined here will override the config value read from hive2/hive-site (step 1). + --> <property> <name>hive.server2.thrift.port</name> <value>10500</value> @@ -435,8 +446,8 @@ limitations under the License. </property> <property> <name>hive.llap.daemon.yarn.container.mb</name> - <display-name>YARN Memory per Daemon</display-name> - <description>The total YARN memory per node to be used by Hive LLAP daemons. This includes memory for cache as well as for memory for query processing.</description> + <display-name>Memory per daemon</display-name> + <description>Total memory used by individual LLAP daemons. This includes memory for the cache as well as for the query execution.</description> <value>{{yarn_scheduler_allocation_minimum_mb}}</value> <value-attributes> <type>int</type> http://git-wip-us.apache.org/repos/asf/ambari/blob/b13eca9a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml index 93a2073..3c83c5c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml @@ -17,6 +17,16 @@ limitations under the License. --> <configuration supports_final="true"> + <!-- + Note: This file includes only those configs which are supposed to have different value from the parent tez/tez-site. + It inherits the other required configs from tez/tez-site. + The inheritance logic in order to get tez_hive2/tez-site goes like this : + + 1. We read the tez/tez-site which includes the stack defaults and Stack Advisor recommended values. + 2. We take the read tez/tez-site (step 1), and on top of it apply the tez-interactive-site to get tez_hive2/tez-site. + + Therefore, any config defined here will override the config value read from tez/tez-site (step 1). + --> <property> <name>tez.runtime.shuffle.fetch.buffer.percent</name> <value>0.6</value> @@ -57,4 +67,13 @@ <value>false</value> <on-ambari-upgrade add="true"/> </property> + <property> + <name>tez.lib.uris</name> + <value>/hdp/apps/${hdp.version}/tez_hive2/tez.tar.gz</value> + <description>Comma-delimited list of the location of the Tez libraries which will be localized for DAGs. + Specifying a single .tar.gz or .tgz assumes that a compressed version of the tez libs is being used. This is uncompressed into a tezlibs directory when running containers, and tezlibs/;tezlibs/lib/ are added to the classpath (after . and .*). + If multiple files are specified - files are localized as regular files, contents of directories are localized as regular files (non-recursive). + </description> + <on-ambari-upgrade add="true"/> + </property> </configuration>
