Browse Source

AMBARI-4286. Ambari install fails during install cluster. MySQL server
fails. (aonishuk)

Andrew Onischuk 11 years ago
parent
commit
7e5b5d1763

+ 1 - 1
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,

+ 7 - 13
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)
 
 
 

+ 1 - 1
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,

+ 7 - 13
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)