AMBARI-4286. Ambari install fails during install cluster. MySQL server fails. (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7e5b5d17 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7e5b5d17 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7e5b5d17 Branch: refs/heads/trunk Commit: 7e5b5d176315f2e3f634de02448080f196f21f4e Parents: 589e92d Author: Andrew Onischuk <[email protected]> Authored: Tue Jan 14 11:29:45 2014 -0800 Committer: Andrew Onischuk <[email protected]> Committed: Tue Jan 14 11:32:30 2014 -0800 ---------------------------------------------------------------------- .../HIVE/package/scripts/mysql_server.py | 2 +- .../HIVE/package/scripts/mysql_service.py | 20 +++++++------------- .../HIVE/package/scripts/mysql_server.py | 2 +- .../HIVE/package/scripts/mysql_service.py | 20 +++++++------------- 4 files changed, 16 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7e5b5d17/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_server.py b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_server.py index 5360f99..a45d310 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_server.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_server.py @@ -47,7 +47,7 @@ class MysqlServer(Script): # Autoescaping cmd = ("bash", "-x", params.mysql_adduser_path, self.daemon_name, - params.hive_metastore_user_name, params.hive_metastore_user_passwd, params.mysql_host[0]) + params.hive_metastore_user_name, str(params.hive_metastore_user_passwd) , params.mysql_host[0]) Execute(cmd, tries=3, http://git-wip-us.apache.org/repos/asf/ambari/blob/7e5b5d17/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_service.py b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_service.py index 4716343..cfb3e08 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_service.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_service.py @@ -22,23 +22,17 @@ from resource_management import * def mysql_service(daemon_name=None, action='start'): + cmd = format('service {daemon_name} {action}') - logoutput=True - if action == 'start': - cmd = format('service {daemon_name} start') - elif action == 'stop': - cmd = format('service {daemon_name} stop') - elif action == 'status': - cmd = format('service {daemon_name} status') + if action == 'status': logoutput = False else: - cmd = None + logoutput = True - if cmd is not None: - Execute(cmd, - path="/usr/local/bin/:/bin/:/sbin/", - tries=1, - logoutput=logoutput) + Execute(cmd, + path="/usr/local/bin/:/bin/:/sbin/", + tries=1, + logoutput=logoutput) http://git-wip-us.apache.org/repos/asf/ambari/blob/7e5b5d17/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_server.py b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_server.py index 5360f99..a45d310 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_server.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_server.py @@ -47,7 +47,7 @@ class MysqlServer(Script): # Autoescaping cmd = ("bash", "-x", params.mysql_adduser_path, self.daemon_name, - params.hive_metastore_user_name, params.hive_metastore_user_passwd, params.mysql_host[0]) + params.hive_metastore_user_name, str(params.hive_metastore_user_passwd) , params.mysql_host[0]) Execute(cmd, tries=3, http://git-wip-us.apache.org/repos/asf/ambari/blob/7e5b5d17/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_service.py b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_service.py index 4716343..cfb3e08 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_service.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_service.py @@ -22,23 +22,17 @@ from resource_management import * def mysql_service(daemon_name=None, action='start'): + cmd = format('service {daemon_name} {action}') - logoutput=True - if action == 'start': - cmd = format('service {daemon_name} start') - elif action == 'stop': - cmd = format('service {daemon_name} stop') - elif action == 'status': - cmd = format('service {daemon_name} status') + if action == 'status': logoutput = False else: - cmd = None + logoutput = True - if cmd is not None: - Execute(cmd, - path="/usr/local/bin/:/bin/:/sbin/", - tries=1, - logoutput=logoutput) + Execute(cmd, + path="/usr/local/bin/:/bin/:/sbin/", + tries=1, + logoutput=logoutput)
