Repository: ambari
Updated Branches:
  refs/heads/trunk 0f10e841a -> 43da8facc


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/43da8fac
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/43da8fac
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/43da8fac

Branch: refs/heads/trunk
Commit: 43da8facca2056670fe58226f201eb6ac029439a
Parents: 0f10e84
Author: Vitaly Brodetskyi <[email protected]>
Authored: Thu Sep 24 13:32:13 2015 +0300
Committer: Vitaly Brodetskyi <[email protected]>
Committed: Thu Sep 24 13:32:13 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/43da8fac/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/43da8fac/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 %}

Reply via email to