ERP5 SR: Use mariadb backup from erp5-cluster.

Side effect: activate binlogs.
current backup system does not work.

slapos/recipe/generic_mysql/__init__.py

@@ -53,6 +53,15 @@ class Recipe(GenericBaseRecipe):
     else:
       networking = 'skip-networking'
 
+    log_bin = self.options.get('binlog-path', '')
+    if log_bin:
+      log_bin = 'log_bin = %s' % log_bin
+    expire_logs_days = self.options.get('binlog-expire-days')
+    if expire_logs_days > 0:
+      expire_logs_days = 'expire_logs_days = %s' % expire_logs_days
+    else:
+      expire_logs_days = ''
+
     mysql_conf_file = self.createFile(
       self.options['conf-file'],
       self.substituteTemplate(template_filename, {
@@ -62,6 +71,8 @@ class Recipe(GenericBaseRecipe):
         'socket': self.options['socket'],
         'error_log': self.options['error-log'],
         'slow_query_log': self.options['slow-query-log'],
+        'log_bin': log_bin,
+        'expire_logs_days': expire_logs_days,
       })
     )
     path_list.append(mysql_conf_file)

slapos/recipe/generic_mysql/template/my.cnf.in

@@ -48,9 +48,8 @@ innodb_locks_unsafe_for_binlog = 1
 #innodb_doublewrite = 0
 #sync_frm = 0
 
-# Uncomment the following if you need binary logging, which is recommended
-# on production instances (either for replication or incremental backups).
-#log-bin=mysql-bin
+%(log_bin)s
+%(expire_logs_days)s
 
 # Force utf8 usage
 collation_server = utf8_unicode_ci

stack/erp5/buildout.cfg

@@ -18,6 +18,7 @@ extends =
   ../../component/gzip/buildout.cfg
   ../../component/haproxy/buildout.cfg
   ../../component/hookbox/buildout.cfg
+  ../../component/findutils/buildout.cfg
   ../../component/librsvg/buildout.cfg
   ../../component/imagemagick/buildout.cfg
   ../../component/inkscape/buildout.cfg
@@ -68,6 +69,7 @@ parts =
   apache
   apache-antiloris
   file
+  findutils
   graphviz
   haproxy
   jsl
@@ -148,10 +150,11 @@ context =
 [template-mariadb]
 < = template-jinja2-base
 filename = instance-mariadb.cfg
-md5sum = e0c923a8195b5a36c7df766c1fb4bfdb
+md5sum = 94b4b4e30ce70077c5601f16d3f96f74
 extra-context =
     key coreutils_location coreutils:location
     key dcron_location dcron:location
+    key findutils_location findutils:location
     key gettext_location gettext:location
     key grep_location grep:location
     key gzip_location gzip:location

stack/erp5/instance-mariadb.cfg.in

@@ -7,6 +7,7 @@ parts =
   cron
   cron-entry-logrotate
   cron-entry-mariadb-backup
+  cron-entry-mariadb-backup-expire
   binary-link
   promise
 
@@ -18,14 +19,44 @@ offline = true
 recipe = slapos.cookbook:publishurl
 url = mysql://${mariadb-instance:user}:${mariadb-instance:password}@${mariadb-instance:ip}:${mariadb-instance:port}/${mariadb-instance:database}
 
+[binary-wrap-base]
+recipe = slapos.cookbook:wrapper
+# Note: --defaults-file must be the first argument, otherwise wrapped binary
+# will reject it.
+command-line = "{{ mariadb_location }}/bin/${:command}" --defaults-file="${mariadb-instance:conf-file}"
+wrapper-path = ${rootdirectory:bin}/${:command}
+parameters-extra = true
+
+[binary-wrap-mysqldump]
+< = binary-wrap-base
+command = mysqldump
+
 [cron-entry-mariadb-backup]
-<= cron
 recipe = slapos.cookbook:cron.d
+cron-entries = ${cron:cron-entries}
 name = mariadb-backup
-frequency = 0 0 * * *
-command = ${mariadb-instance:backup-script}
+frequency = 0 22 * * *
+{# When binlogs are enabled:
+# flush-logs: used so no manipulation on binlogs is needed to restore from
+#   full + binlogs. The first binlog after a dump starts from dump snapshot and
+#   can be fully restored.
+# master-data: use value "2" as we are not in a replication case
+#}
+command = "${binary-wrap-mysqldump:wrapper-path}" -u root --all-databases --single-transaction --flush-logs --master-data=2 --socket=${mariadb-instance:socket} | {{ gzip_location }}/bin/gzip > "${directory:mariadb-backup-full}/$({{ coreutils_location }}/bin/date "+%Y%m%d%H%M%S").sql.gz"
+{# KEEP GLOB PATTERN IN SYNC with generated filenames above
+#           YYYYmmddHHMMSS -#}
+file-glob = ??????????????.sql.gz
+
+[cron-entry-mariadb-backup-expire]
+recipe = slapos.cookbook:cron.d
+cron-entries = ${cron:cron-entries}
+name = mariadb-backup-expire
+frequency = 0 22 * * *
+command = {{ findutils_location }}/bin/find "${directory:mariadb-backup-full}" -maxdepth 1 -name "${cron-entry-mariadb-backup:file-glob}" -daystart -mtime +7 -delete
 
 [mariadb-instance]
+# XXX: remove backup part of this recipe. Backup part is now done in previous sections.
+# Keeping it is harmless because it is supposed to be launched by cron entry, which has been removed.
 recipe = slapos.cookbook:generic.mysql
 
 # Options
@@ -39,6 +70,11 @@ test-database = erp5_test
 mysql-test-database-base = testdb
 mysql-test-user-base = testuser
 
+# Backup
+binlog-path = ${directory:mariadb-backup-incremental}/binlog
+# XXX: binlog rotation happens along with other log's rotation
+binlog-expire-days = 7
+
 # Paths
 wrapper = ${basedirectory:services}/mariadb
 update-wrapper = ${basedirectory:services}/mariadb_update