AMBARI-5542. Fix Hive and Mysql on Ubuntu (aonishuk)

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml

@@ -74,59 +74,19 @@
               <type>rpm</type>
               <name>mysql-connector-java</name>
             </package>
-            <package>
-              <type>rpm</type>
-              <name>mysql</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>centos6</osFamily>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>mysql-server</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>centos5</osFamily>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>mysql-server</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>redhat6</osFamily>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>mysql-server</name>
-            </package>
           </packages>
         </osSpecific>
         <osSpecific>
-          <osFamily>redhat5</osFamily>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
           <packages>
             <package>
               <type>rpm</type>
-              <name>mysql-server</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>oraclelinux6</osFamily>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>mysql-server</name>
+              <name>mysql</name>
             </package>
           </packages>
         </osSpecific>
         <osSpecific>
-          <osFamily>oraclelinux5</osFamily>
+          <osFamily>redhat5,redhat6,debian12</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -143,15 +103,6 @@
             </package>
           </packages>
         </osSpecific>
-        <osSpecific>
-          <osFamily>sles11</osFamily>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>mysql-client</name>
-            </package>
-          </packages>
-        </osSpecific>
       </osSpecifics>
 
       <commandScript>

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/mysql_server.py

@@ -48,8 +48,6 @@ class MysqlServer(Script):
             path='/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'
     )
 
-    mysql_service(daemon_name=params.daemon_name, action='stop')
-
   def start(self, env):
     import params
     env.set_params(params)

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/mysql_service.py

@@ -22,15 +22,17 @@ from resource_management import *
 
 
 def mysql_service(daemon_name=None, action='start'):
-  cmd = format('service {daemon_name} {action}')
-
+  
   if action == 'status':
     logoutput = False
   else:
     logoutput = True
-
+    # required for running hive
+    replace_bind_address = format("sed -i 's|^bind-address[ \t]*=.*|bind-address = 0.0.0.0|' {mysql_configname}")  
+    Execute(replace_bind_address)
+    
+  cmd = format('service {daemon_name} {action}')
   Execute(cmd,
-          path="/usr/local/bin/:/bin/:/sbin/",
           tries=1,
           logoutput=logoutput)
 

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py

@@ -172,6 +172,12 @@ tez_local_api_jars = '/usr/lib/tez/tez*.jar'
 tez_local_lib_jars = '/usr/lib/tez/lib/*.jar'
 tez_user = config['configurations']['global']['tez_user']
 
+if System.get_instance().os_family == "debian":
+  mysql_configname = '/etc/mysql/my.cnf'
+else:
+  mysql_configname = '/etc/my.cnf'
+  
+
 # Hive security
 hive_authorization_enabled = config['configurations']['hive-site']['hive.security.authorization.enabled']
 

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/status_params.py

@@ -29,7 +29,7 @@ hive_metastore_pid = 'hive.pid'
 
 hcat_pid_dir = config['configurations']['global']['hcat_pid_dir'] #hcat_pid_dir
 
-if System.get_instance().os_family == "suse":
+if System.get_instance().os_family == "suse" or System.get_instance().os_family == "debian":
   daemon_name = 'mysql'
 else:
-  daemon_name = 'mysqld'
+  daemon_name = 'mysqld'

ambari-server/src/test/python/stacks/2.0.6/HIVE/test_mysql_server.py

@@ -38,9 +38,10 @@ class TestMySqlServer(RMFTestCase):
                        config_file="default.json"
     )
 
+    self.assertResourceCalled('Execute', "sed -i 's|^bind-address[ \t]*=.*|bind-address = 0.0.0.0|' /etc/my.cnf",
+    )
     self.assertResourceCalled('Execute', 'service mysql start',
                        logoutput = True,
-                       path = ['/usr/local/bin/:/bin/:/sbin/'],
                        tries = 1,
     )
     self.assertNoMoreResources()
@@ -52,9 +53,10 @@ class TestMySqlServer(RMFTestCase):
                        config_file="default.json"
     )
 
+    self.assertResourceCalled('Execute', "sed -i 's|^bind-address[ \t]*=.*|bind-address = 0.0.0.0|' /etc/my.cnf",
+    )
     self.assertResourceCalled('Execute', 'service mysql stop',
                               logoutput = True,
-                              path = ['/usr/local/bin/:/bin/:/sbin/'],
                               tries = 1,
     )
     self.assertNoMoreResources()
@@ -76,9 +78,10 @@ class TestMySqlServer(RMFTestCase):
                        config_file="secured.json"
     )
 
+    self.assertResourceCalled('Execute', "sed -i 's|^bind-address[ \t]*=.*|bind-address = 0.0.0.0|' /etc/my.cnf",
+    )
     self.assertResourceCalled('Execute', 'service mysql start',
                               logoutput = True,
-                              path = ['/usr/local/bin/:/bin/:/sbin/'],
                               tries = 1,
                               )
     self.assertNoMoreResources()
@@ -89,18 +92,20 @@ class TestMySqlServer(RMFTestCase):
                        command = "stop",
                        config_file="secured.json"
     )
-
+    
+    self.assertResourceCalled('Execute', "sed -i 's|^bind-address[ \t]*=.*|bind-address = 0.0.0.0|' /etc/my.cnf",
+    )
     self.assertResourceCalled('Execute', 'service mysql stop',
                               logoutput = True,
-                              path = ['/usr/local/bin/:/bin/:/sbin/'],
                               tries = 1,
                               )
     self.assertNoMoreResources()
 
   def assert_configure_default(self):
+    self.assertResourceCalled('Execute', "sed -i 's|^bind-address[ \t]*=.*|bind-address = 0.0.0.0|' /etc/my.cnf",
+    )
     self.assertResourceCalled('Execute', 'service mysql start',
       logoutput = True,
-      path = ['/usr/local/bin/:/bin/:/sbin/'],
       tries = 1,
     )
     self.assertResourceCalled('File', '/tmp/addMysqlUser.sh',
@@ -112,16 +117,12 @@ class TestMySqlServer(RMFTestCase):
       tries = 3,
       try_sleep = 5,
     )
-    self.assertResourceCalled('Execute', 'service mysql stop',
-      logoutput = True,
-      path = ['/usr/local/bin/:/bin/:/sbin/'],
-      tries = 1,
-    )
 
   def assert_configure_secured(self):
+    self.assertResourceCalled('Execute', "sed -i 's|^bind-address[ \t]*=.*|bind-address = 0.0.0.0|' /etc/my.cnf",
+    )
     self.assertResourceCalled('Execute', 'service mysql start',
       logoutput = True,
-      path = ['/usr/local/bin/:/bin/:/sbin/'],
       tries = 1,
     )
     self.assertResourceCalled('File', '/tmp/addMysqlUser.sh',
@@ -133,8 +134,3 @@ class TestMySqlServer(RMFTestCase):
       tries = 3,
       try_sleep = 5,
     )
-    self.assertResourceCalled('Execute', 'service mysql stop',
-      logoutput = True,
-      path = ['/usr/local/bin/:/bin/:/sbin/'],
-      tries = 1,
-    )