Final improvement of mysql

slapos/recipe/mysql/__init__.py

@@ -24,8 +24,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.recipe.librecipe import GenericBaseRecipe
 import os
+import sys
+import subprocess
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+from slapos.recipe.librecipe import filehash
 
 class Recipe(GenericBaseRecipe):
 
@@ -109,28 +113,16 @@ class Recipe(GenericBaseRecipe):
     path_list.append(mysqld)
 
     # backup configuration
-    mysqldump_binary = self.options['mysqldump-binary']
-    backup_directory = self.options['backup-directory']
-    pending_backup_dir = self.options['backup-pending-directory']
-    dump_filename = self.options['dumpname']
-
-    mysqldump_cmd = [mysqldump_binary,
-                     mysql_conf['mysql_database'],
-                     '-u', 'root',
-                     '-S', mysql_conf['socket'].strip(),
-                     '--single-transaction', '--opt',
-                    ]
-    dump_file = os.path.join(backup_directory, dump_filename)
-    tmpdump_file = os.path.join(pending_backup_dir, dump_filename)
+    if self.optionIsTrue('backup', default=False):
       backup_script = self.createPythonScript(
         self.options['backup-script'],
-      '%s.backup.do_backup' % __name__,
-      {
-        'mysqldump': mysqldump_cmd,
-        'gzip': self.options['gzip-binary'],
-        'tmpdump': tmpdump_file,
-        'dumpfile': dump_file,
-      },
+        '%s.do_backup' % __name__,
+        dict(
+          mydumper_binary=self.options['mydumper-binary'],
+          database=mysql_conf['mysql_database'],
+          socket=mysql_conf['socket'],
+          backup_directory=self.options['backup-directory']
+        ),
       )
       path_list.append(backup_script)
 
@@ -138,7 +130,7 @@ class Recipe(GenericBaseRecipe):
     if self.optionIsTrue('recovering', default=False):
       recovering_script = self.createPythonScript(
         self.options['recovering-wrapper'],
-        '%s.recover.import_remote_dump' % __name__,
+        '%s.import_dump' % __name__,
         {
           'lock_file': os.path.join(self.work_directory,
                                     'import_done'),
@@ -156,3 +148,47 @@ class Recipe(GenericBaseRecipe):
 
 
     return path_list
+
+# Replace zcat dump.sql.gz | mysql
+def import_dump(args):
+  # Get data from kwargs
+  cache_file = args['cache_file']
+  database = args['database']
+  mysql_binary = args['mysql_binary']
+  mysql_socket = args['mysql_socket']
+  dump_file = args['dump_file']
+  zcat_binary = args['zcat_binary']
+
+  sha512sum = filehash(dump_file)
+  with open(cache_file, 'r') as cache_fileobj:
+    last_sha512sum = cache_fileobj.read().strip()
+
+  if sha512sum != last_sha512sum:
+    zcat = subprocess.Popen([zcat_binary, dump_file], stdout=subprocess.PIPE)
+    mysql = subprocess.Popen([mysql_binary, '--socket=%s' % mysql_socket, '-D',
+                              database, '-u', 'root'], stdin=zcat.stdout)
+    zcat.stdout.close()
+
+    returncode = mysql.wait()
+
+    if returncode == 0:
+      with open(cache_file, 'w') as cache_fileobj:
+        cache_fileobj.write(sha512sum)
+
+    sys.exit(returncode)
+
+def promise(args):
+  # This is not a dependency of slapos.cookbook, because it shall be runned
+  # in a python environment having mysql-python
+  import MySQLdb
+
+  user = args['user']
+  password = args['password']
+  db = args['db']
+  host = args['host']
+  port = args['port']
+
+  db = MySQLdb.connect(host=host, port=port, user=user, passwd=password,
+                       db=db)
+  cursor = db.cursor()
+  cursor.close()

slapos/recipe/mysql/backup.py

 import subprocess
 import os
 
-# Replace mysqldump | gzip > tmpdump && mv -f tmpdump dumpfile
-def do_backup(kwargs):
-  mysqldump_cmd = kwargs['mysqldump']
-  gzip_bin = kwargs['gzip']
-  tmpdump = kwargs['tmpdump']
-  dumpfile = kwargs['dumpfile']
-
-  # mysqldump | gzip > tmpdump
-  with open(tmpdump, 'w') as output:
-    mysqldump = subprocess.Popen(mysqldump_cmd,
-                                 stdout=subprocess.PIPE,
-                                 stderr=subprocess.STDOUT)
-    gzip = subprocess.Popen([gzip_bin],
-                            stdin=mysqldump.stdout,
-                            stdout=output,
-                            stderr=subprocess.STDOUT)
-    mysqldump.stdout.close()
-
-    if gzip.wait() != 0:
-      raise ValueError("Gzip return a non zero value.")
-
-  os.rename(tmpdump, dumpfile)

slapos/recipe/mysql/catdatefile.py

-import os
-import sys
-import time
-def catdatefile(args):
-  directory = args[0]
-  try:
-    suffix = args[1]
-  except IndexError:
-    suffix = '.log'
-  f = open(os.path.join(directory,
-    time.strftime('%Y-%m-%d.%H:%M.%s') + suffix), 'aw')
-  for line in sys.stdin.read():
-    f.write(line)
-  f.close()

slapos/recipe/mysql/recover.py

-import sys
-import os
-import time
-import subprocess
-
-def import_remote_dump(kwargs):
-  # Get data from kwargs
-  lock_file = kwargs['lock_file']
-  database = kwargs['database']
-  mysql_binary = kwargs['mysql_binary']
-  mysql_socket = kwargs['mysql_socket']
-  duplicity_binary = kwargs['duplicity_binary']
-  remote_backup = kwargs['remote_backup']
-  local_directory = kwargs['local_directory']
-  dump_name = kwargs['dump_name']
-  zcat_binary = kwargs['zcat_binary']
-
-  # The script start really here
-  if os.path.exists(lock_file):
-    sys.exit(127)
-
-  while subprocess.call([mysql_binary, '--socket=%s' % mysql_socket,
-                         '-u', 'root', '-e', 'use %s;' % database]) != 0:
-    time.sleep(10)
-
-  subprocess.check_call([duplicity_binary, 'restore', '--no-encryption',
-                         remote_backup, local_directory])
-
-  zcat = subprocess.Popen([zcat_binary, os.path.join(local_directory,
-                                                     dump_name)],
-                          stdout=subprocess.PIPE)
-  mysql = subprocess.Popen([mysql_binary, '--socket=%s' % mysql_socket,
-                            '-D', database, '-u', 'root'],
-                           stdin=zcat.stdout)
-  zcat.stdout.close()
-
-  returncode = mysql.poll()
-
-  if returncode == 0:
-    open(lock_file, 'w').close() # Just a touch
-
-  sys.exit(returncode)