From 5ab2eda080c803029db7500f112ed9875360c48d Mon Sep 17 00:00:00 2001 From: Michael Baker Date: Tue, 30 May 2017 14:44:27 +0800 Subject: [PATCH 1/2] PROCESS is now required Fails on newer MySQL versions --- manifests/backup/xtrabackup.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/backup/xtrabackup.pp b/manifests/backup/xtrabackup.pp index 6f9c4c162..e0a13e9de 100644 --- a/manifests/backup/xtrabackup.pp +++ b/manifests/backup/xtrabackup.pp @@ -40,7 +40,7 @@ ensure => $ensure, user => "${backupuser}@localhost", table => '*.*', - privileges => [ 'RELOAD', 'LOCK TABLES', 'REPLICATION CLIENT' ], + privileges => [ 'RELOAD', 'PROCESS', 'LOCK TABLES', 'REPLICATION CLIENT' ], require => Mysql_user["${backupuser}@localhost"], } } From 3241ccae084b67c300a8c191bfdf6f8f2b224187 Mon Sep 17 00:00:00 2001 From: Michael Baker Date: Thu, 28 Sep 2017 11:29:11 +0800 Subject: [PATCH 2/2] Pass in additional_cron_args to cron --- manifests/backup/xtrabackup.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/backup/xtrabackup.pp b/manifests/backup/xtrabackup.pp index e0a13e9de..df9edcaf9 100644 --- a/manifests/backup/xtrabackup.pp +++ b/manifests/backup/xtrabackup.pp @@ -23,6 +23,7 @@ $postscript = false, $execpath = '/usr/bin:/usr/sbin:/bin:/sbin', $optional_args = [], + $additional_cron_args = '' ) inherits mysql::params { package{ $xtrabackup_package_name: @@ -47,7 +48,7 @@ cron { 'xtrabackup-weekly': ensure => $ensure, - command => "/usr/local/sbin/xtrabackup.sh ${backupdir}", + command => "/usr/local/sbin/xtrabackup.sh ${backupdir} ${additional_cron_args}", user => 'root', hour => $time[0], minute => $time[1], @@ -57,7 +58,7 @@ cron { 'xtrabackup-daily': ensure => $ensure, - command => "/usr/local/sbin/xtrabackup.sh --incremental ${backupdir}", + command => "/usr/local/sbin/xtrabackup.sh --incremental ${backupdir} ${additional_cron_args}", user => 'root', hour => $time[0], minute => $time[1],