You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2014/10/11 14:57:42 UTC
git commit: AMBARI-7745 Oozie server start fails on 2.2 stack with
postgres external (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 fcabbac24 -> ea9aaf918
AMBARI-7745 Oozie server start fails on 2.2 stack with postgres external (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ea9aaf91
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ea9aaf91
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ea9aaf91
Branch: refs/heads/branch-1.7.0
Commit: ea9aaf9189a0e30ae6f8f96123e36acaa4ec47b7
Parents: fcabbac
Author: Dmytro Sen <ds...@hortonworks.com>
Authored: Sat Oct 11 15:19:24 2014 +0300
Committer: Dmytro Sen <ds...@hortonworks.com>
Committed: Sat Oct 11 15:57:18 2014 +0300
----------------------------------------------------------------------
.../HDP/2.0.6/services/OOZIE/package/scripts/oozie_service.py | 4 ++--
.../stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea9aaf91/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie_service.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie_service.py
index 5f53a1b..ac4280a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie_service.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie_service.py
@@ -40,11 +40,11 @@ def oozie_service(action = 'start'): # 'start' or 'stop'
cmd2 = format("{kinit_if_needed} {put_shared_lib_to_hdfs_cmd} ; hadoop --config {hadoop_conf_dir} dfs -chmod -R 755 {oozie_hdfs_user_dir}/share")
if not os.path.isfile(params.jdbc_driver_jar) and params.jdbc_driver_name == "org.postgresql.Driver":
- print "ERROR: jdbc file " + params.jdbc_driver_jar + " is unavailable. Please, follow next steps:\n" \
+ print format("ERROR: jdbc file {jdbc_driver_jar} is unavailable. Please, follow next steps:\n" \
"1) Download postgresql-9.0-801.jdbc4.jar.\n2) Create needed directory: mkdir -p {oozie_home}/libserver/\n" \
"3) Copy postgresql-9.0-801.jdbc4.jar to newly created dir: cp /path/to/jdbc/postgresql-9.0-801.jdbc4.jar " \
"{oozie_home}/libserver/\n4) Copy postgresql-9.0-801.jdbc4.jar to libext: cp " \
- "/path/to/jdbc/postgresql-9.0-801.jdbc4.jar {oozie_home}/libext/\n"
+ "/path/to/jdbc/postgresql-9.0-801.jdbc4.jar {oozie_home}/libext/\n")
exit(1)
if db_connection_check_command:
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea9aaf91/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py
index 40ede9b..3dbe1fe 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py
@@ -108,7 +108,7 @@ jdbc_driver_name = default("/configurations/oozie-site/oozie.service.JPAService.
if jdbc_driver_name == "com.mysql.jdbc.Driver":
jdbc_driver_jar = "/usr/share/java/mysql-connector-java.jar"
elif jdbc_driver_name == "org.postgresql.Driver":
- jdbc_driver_jar = "/usr/lib/oozie/libserver/postgresql-9.0-801.jdbc4.jar"
+ jdbc_driver_jar = format("{oozie_home}/libserver/postgresql-9.0-801.jdbc4.jar")
elif jdbc_driver_name == "oracle.jdbc.driver.OracleDriver":
jdbc_driver_jar = "/usr/share/java/ojdbc6.jar"
else: