You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2015/09/24 12:30:16 UTC
ambari git commit: AMBARI-13221. Oozie and hive based on sqla failes
on start.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 678dbca89 -> 979360075
AMBARI-13221. Oozie and hive based on sqla failes on start.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/97936007
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/97936007
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/97936007
Branch: refs/heads/branch-2.1
Commit: 9793600755599cbcbc2fb2e19f8c673b0a21290d
Parents: 678dbca
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Thu Sep 24 13:30:03 2015 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Thu Sep 24 13:30:03 2015 +0300
----------------------------------------------------------------------
.../common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml | 2 +-
.../stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/97936007/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml
index 59fbe15..93742bb 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml
@@ -95,7 +95,7 @@ export JAVA_LIBRARY_PATH={{hadoop_lib_home}}/native/Linux-amd64-64
# upgrade/downgrade
export OOZIE_CLIENT_OPTS="${OOZIE_CLIENT_OPTS} -Doozie.connection.retry.count=5 "
-{% if lib_dir_available %}
+{% if sqla_db_used or lib_dir_available %}
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:{{jdbc_libs_dir}}"
export JAVA_LIBRARY_PATH="$JAVA_LIBRARY_PATH:{{jdbc_libs_dir}}"
{% endif %}
http://git-wip-us.apache.org/repos/asf/ambari/blob/97936007/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
index 1290a75..30141c6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
@@ -61,7 +61,7 @@ fi
export METASTORE_PORT={{hive_metastore_port}}
-{% if lib_dir_available %}
+{% if sqla_db_used or lib_dir_available %}
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:{{jdbc_libs_dir}}"
export JAVA_LIBRARY_PATH="$JAVA_LIBRARY_PATH:{{jdbc_libs_dir}}"
{% endif %}