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 2013/09/26 19:07:06 UTC
git commit: AMBARI-3349 upgradestack script for oracle uses incorrect
parameters (dsen)
Updated Branches:
refs/heads/branch-1.4.1 a68f5fa8e -> 41d26e43d
AMBARI-3349 upgradestack script for oracle uses incorrect parameters (dsen)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/41d26e43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/41d26e43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/41d26e43
Branch: refs/heads/branch-1.4.1
Commit: 41d26e43da836e16b1fb53ac6c99d959eb88a00c
Parents: a68f5fa
Author: Dmitry Sen <ds...@hortonworks.com>
Authored: Thu Sep 26 20:06:38 2013 +0300
Committer: Dmitry Sen <ds...@hortonworks.com>
Committed: Thu Sep 26 20:06:38 2013 +0300
----------------------------------------------------------------------
ambari-server/src/main/python/ambari-server.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/41d26e43/ambari-server/src/main/python/ambari-server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py
index b3be818..d6603e3 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -335,7 +335,7 @@ ORACLE_EXEC_ARGS = "-S '{0}/{1}@(description=(address=(protocol=TCP)(host={2})(p
MYSQL_EXEC_ARGS = "--host={0} --port={1} --user={2} --password={3} {4} " \
"-e\"set @schema=\'{4}\'; set @username=\'{2}\'; source {5};\""
-ORACLE_UPGRADE_STACK_ARGS = "-S '{0}/{1}@(description=(address=(protocol=TCP)(host={2})(port={3}))(connect_data=({6}={4})))' @{5} {0} {7}"
+ORACLE_UPGRADE_STACK_ARGS = "-S '{0}/{1}@(description=(address=(protocol=TCP)(host={2})(port={3}))(connect_data=({6}={4})))' @{5} {7} {8}"
JDBC_PATTERNS = {"oracle":"*ojdbc*.jar", "mysql":"*mysql*.jar"}
DATABASE_FULL_NAMES = {"oracle":"Oracle", "mysql":"MySQL", "postgres":"PostgreSQL"}
@@ -1284,6 +1284,7 @@ def remote_stack_upgrade(args, scriptPath, stackId):
print_info_msg("using SERVICE_NAME instead of SID for Oracle")
sid_or_sname = "service_name"
+ stack_name, stack_version = stackId.split(STACK_NAME_VER_SEP)
retcode, out, err = run_in_shell('{0} {1}'.format(tool, ORACLE_UPGRADE_STACK_ARGS.format(
args.database_username,
args.database_password,
@@ -1292,7 +1293,8 @@ def remote_stack_upgrade(args, scriptPath, stackId):
args.database_name,
scriptPath,
sid_or_sname,
- stackId
+ stack_name,
+ stack_version
)))
return retcode, out, err