Clean up generic.mysql.wrap_update_mysql

--user=root is redundant and it will break with MariaDB 10.4

slapos/recipe/generic_mysql/__init__.py

@@ -32,10 +32,10 @@ class WrapUpdateMySQL(GenericBaseRecipe):
       self.createPythonScript(
         self.options['output'],
         __name__ + '.mysql.updateMysql',
-        [{
+        kw = {
           'mysql_upgrade_binary': self.options['binary'],
           'mysql_binary': self.options['mysql'],
           'mysql_script_file': self.options['init-script'],
-        }]
+        }
       ),
     ]

slapos/recipe/generic_mysql/mysql.py

@@ -4,69 +4,45 @@ import time
 import sys
 import pytz
 
-def updateMysql(conf):
+def updateMysql(mysql_upgrade_binary, mysql_binary, mysql_script_file):
   sleep = 30
-  is_succeed = False
-  try:
-    script_filename = conf.pop('mysql_script_file')
-  except KeyError:
-    pass
-  else:
-    assert 'mysql_script' not in conf
-    with open(script_filename) as script_file:
-      conf['mysql_script'] = script_file.read()
-  is_succeeded = False
+  with open(mysql_script_file) as script_file:
+    mysql_script = script_file.read()
+  mysql_list = mysql_binary, '-B'
+  mysql_tzinfo_to_sql_list = (
+    os.path.join(os.path.dirname(mysql_binary), 'mysql_tzinfo_to_sql'),
+    os.path.join(os.path.dirname(pytz.__file__), 'zoneinfo'),
+  )
   while True:
     while True:
-      mysql_upgrade_list = [conf['mysql_upgrade_binary'], '--user=root']
-      if 'socket' in conf:
-        mysql_upgrade_list.append('--socket=' + conf['socket'])
-      mysql_upgrade = subprocess.Popen(mysql_upgrade_list, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+      mysql_upgrade = subprocess.Popen(mysql_upgrade_binary,
+        stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
       result = mysql_upgrade.communicate()[0]
-      if mysql_upgrade.returncode is None:
-        mysql_upgrade.kill()
-      if mysql_upgrade.returncode == 0:
-        print "MySQL database upgraded with result:\n%s" % result
-      elif 'is already upgraded' in result:
-        print "No need to upgrade MySQL database"
-      else:
-        print "Command %r failed with result:\n%s" % (mysql_upgrade_list, result)
+      if mysql_upgrade.returncode:
+        print "Command %r failed with result:\n%s" % (mysql_upgrade_binary, result)
         break
-      mysql_list = [conf['mysql_binary'].strip(), '-B', '--user=root']
-      if 'socket' in conf:
-        mysql_list.append('--socket=' + conf['socket'])
+      print "MySQL database upgraded with result:\n%s" % result
       mysql = subprocess.Popen(mysql_list, stdin=subprocess.PIPE,
           stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-      result = mysql.communicate(conf['mysql_script'])[0]
-      if mysql.returncode is None:
-        mysql.kill()
-      if mysql.returncode != 0:
+      result = mysql.communicate(mysql_script)[0]
+      if mysql.returncode:
         print 'Command %r failed with:\n%s' % (mysql_list, result)
         break
       # import timezone database
-      mysql_tzinfo_to_sql_binary = os.path.join(
-        os.path.dirname(conf['mysql_binary'].strip()), 'mysql_tzinfo_to_sql')
-      zoneinfo_directory = '%s/zoneinfo' % os.path.dirname(pytz.__file__)
-      mysql_tzinfo_to_sql_list = [mysql_tzinfo_to_sql_binary, zoneinfo_directory]
       mysql_tzinfo_to_sql = subprocess.Popen(mysql_tzinfo_to_sql_list, stdin=subprocess.PIPE,
                                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
       timezone_sql = mysql_tzinfo_to_sql.communicate()[0]
       if mysql_tzinfo_to_sql.returncode != 0:
         print 'Command %r failed with:\n%s' % (mysql_tzinfo_to_sql_list, result)
         break
-      mysql = subprocess.Popen(mysql_list + ['mysql',], stdin=subprocess.PIPE,
+      mysql = subprocess.Popen(mysql_list + ('mysql',), stdin=subprocess.PIPE,
                                stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
       result = mysql.communicate(timezone_sql)[0]
-      if mysql.returncode is None:
-        mysql.kill()
-      if mysql.returncode != 0:
+      if mysql.returncode:
         print 'Command %r failed with:\n%s' % (mysql_list, result)
         break
-      is_succeeded = True
-      break
-    if is_succeeded:
       print 'SlapOS initialisation script succesfully applied on database.'
-      break
+      return
     print 'Sleeping for %ss and retrying' % sleep
     sys.stdout.flush()
     sys.stderr.flush()