Repository: ambari Updated Branches: refs/heads/trunk c2f3eb723 -> 1176ecfa3
AMBARI-5223. hive-env.sh overwrites user value of HIVE_AUX_JARS_PATH.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1176ecfa Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1176ecfa Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1176ecfa Branch: refs/heads/trunk Commit: 1176ecfa3ab8f73e92529a121950d924518291d8 Parents: c2f3eb7 Author: Vitaly Brodetskyi <[email protected]> Authored: Wed Mar 26 17:20:16 2014 +0200 Committer: Vitaly Brodetskyi <[email protected]> Committed: Wed Mar 26 17:20:16 2014 +0200 ---------------------------------------------------------------------- .../HDP/1.3.2/services/HIVE/package/templates/hive-env.sh.j2 | 7 +++++-- .../HDP/2.0.6/services/HIVE/package/templates/hive-env.sh.j2 | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1176ecfa/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/templates/hive-env.sh.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/templates/hive-env.sh.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/templates/hive-env.sh.j2 index 548262a..633304d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/templates/hive-env.sh.j2 +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/templates/hive-env.sh.j2 @@ -51,5 +51,8 @@ HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}} export HIVE_CONF_DIR={{conf_dir}} # Folder containing extra ibraries required for hive compilation/execution can be controlled by: -# export HIVE_AUX_JARS_PATH= -export HIVE_AUX_JARS_PATH={{hive_aux_jars_path}} +if [ "${HIVE_AUX_JARS_PATH}" != "" ]; then + export HIVE_AUX_JARS_PATH=${HIVE_AUX_JARS_PATH} +else + export HIVE_AUX_JARS_PATH={{hive_aux_jars_path}} +fi \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/1176ecfa/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/templates/hive-env.sh.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/templates/hive-env.sh.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/templates/hive-env.sh.j2 index 61f8a60..c4e8619 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/templates/hive-env.sh.j2 +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/templates/hive-env.sh.j2 @@ -51,8 +51,9 @@ HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}} export HIVE_CONF_DIR={{conf_dir}} # Folder containing extra ibraries required for hive compilation/execution can be controlled by: -# export HIVE_AUX_JARS_PATH= -if [ -d "/usr/lib/hive-hcatalog/" ]; then +if [ "${HIVE_AUX_JARS_PATH}" != "" ]; then + export HIVE_AUX_JARS_PATH=${HIVE_AUX_JARS_PATH} +elif [ -d "/usr/lib/hive-hcatalog/" ]; then export HIVE_AUX_JARS_PATH=/usr/lib/hive-hcatalog/share/hcatalog/hive-hcatalog-core-*.jar else export HIVE_AUX_JARS_PATH=/usr/lib/hcatalog/share/hcatalog/hcatalog-core.jar
