Repository: ambari Updated Branches: refs/heads/trunk ffb8e3fa0 -> 072426053
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/07242605 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/07242605 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/07242605 Branch: refs/heads/trunk Commit: 07242605371b7f72f54430f40b41658128150d7a Parents: ffb8e3f Author: Dmytro Sen <[email protected]> Authored: Sat Oct 11 16:02:34 2014 +0300 Committer: Dmytro Sen <[email protected]> Committed: Sat Oct 11 16:02:34 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/07242605/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/07242605/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:
