You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/02/22 17:48:39 UTC
[19/21] ambari git commit: AMBARI-15129. Oozie server unable to load
JDBC driver (aonishuk)
AMBARI-15129. Oozie server unable to load JDBC driver (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2a7196d7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2a7196d7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2a7196d7
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 2a7196d77bca67203e73209cf5c5f9cbdcab28ec
Parents: c8f65e3
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Feb 22 18:03:01 2016 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Feb 22 18:03:01 2016 +0200
----------------------------------------------------------------------
ambari-server/src/main/resources/scripts/Ambaripreupload.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a7196d7/ambari-server/src/main/resources/scripts/Ambaripreupload.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/scripts/Ambaripreupload.py b/ambari-server/src/main/resources/scripts/Ambaripreupload.py
index fb0c3e1..5ce75dd 100644
--- a/ambari-server/src/main/resources/scripts/Ambaripreupload.py
+++ b/ambari-server/src/main/resources/scripts/Ambaripreupload.py
@@ -279,14 +279,15 @@ with Environment() as env:
hadoop_conf_dir = params.hadoop_conf_dir
oozie_libext_dir = format("/usr/hdp/{hdp_version}/oozie/libext")
+ sql_driver_filename = os.path.basename(SQL_DRIVER_PATH)
oozie_home=format("/usr/hdp/{hdp_version}/oozie")
oozie_setup_sh=format("/usr/hdp/{hdp_version}/oozie/bin/oozie-setup.sh")
oozie_setup_sh_current="/usr/hdp/current/oozie-server/bin/oozie-setup.sh"
oozie_tmp_dir = "/var/tmp/oozie"
configure_cmds = []
configure_cmds.append(('tar','-xvf', oozie_home + '/oozie-sharelib.tar.gz','-C', oozie_home))
- configure_cmds.append(('cp', "/usr/share/HDP-oozie/ext-2.2.zip", format("/usr/hdp/{hdp_version}/oozie/libext")))
- configure_cmds.append(('chown', 'oozie:hadoop', oozie_libext_dir + "/ext-2.2.zip"))
+ configure_cmds.append(('cp', "/usr/share/HDP-oozie/ext-2.2.zip", SQL_DRIVER_PATH, oozie_libext_dir))
+ configure_cmds.append(('chown', 'oozie:hadoop', oozie_libext_dir + "/ext-2.2.zip", oozie_libext_dir + "/" + sql_driver_filename))
no_op_test = "ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1"