Jcrespo has submitted this change and it was merged.
Change subject: Correct invalid cron definition; add gtid to backups
......................................................................
Correct invalid cron definition; add gtid to backups
Bug: T131705
Bug: T138562
Change-Id: I548ba5a1a27db81ba00cb7c286df23f11f9be889
---
M manifests/role/mariadb.pp
M templates/mariadb/dumps-misc.sh.erb
M templates/mariadb/dumps-otrs.sh.erb
3 files changed, 13 insertions(+), 12 deletions(-)
Approvals:
Jcrespo: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index e03fd16..ad6491d 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -916,13 +916,14 @@
}
cron { 'otrsbackups':
- minute => '0',
- hour => '0',
- date => '*',
- weekday => '3',
- command => '/usr/local/bin/dumps-otrs.sh',
- user => 'root',
- require => [
+ minute => '0',
+ hour => '0',
+ monthday => '*',
+ month => '*',
+ weekday => '3',
+ command => '/usr/local/bin/dumps-otrs.sh',
+ user => 'root',
+ require => [
File['/usr/local/bin/dumps-otrs.sh'],
File['/srv/backups'],
],
diff --git a/templates/mariadb/dumps-misc.sh.erb
b/templates/mariadb/dumps-misc.sh.erb
index cd532c9..85a2b88 100644
--- a/templates/mariadb/dumps-misc.sh.erb
+++ b/templates/mariadb/dumps-misc.sh.erb
@@ -4,10 +4,10 @@
my="/usr/local/bin/mysql --skip-column-names -e"
dump="/usr/local/bin/mysqldump --single-transaction --quick"
-dump_master="$dump --master-data=2"
-dump_slave="$dump --dump-slave=2 --include-master-host-port"
+dump_master="$dump --master-data=2 --gtid"
+dump_slave="$dump --dump-slave=2 --include-master-host-port --gtid"
-$dump_master -h m1-master --databases bacula etherpadlite librenms puppet
racktables rt | \
+$dump_slave -h m1-slave --databases bacula etherpadlite librenms puppet
racktables rt | \
pigz > /srv/backups/m1-$(date +%Y%m%d%H%M%S).sql.gz &
$dump_slave -h m2-slave --databases iegreview reviewdb scholarships | \
diff --git a/templates/mariadb/dumps-otrs.sh.erb
b/templates/mariadb/dumps-otrs.sh.erb
index fd2ac6b..979770a 100644
--- a/templates/mariadb/dumps-otrs.sh.erb
+++ b/templates/mariadb/dumps-otrs.sh.erb
@@ -4,8 +4,8 @@
my="/usr/local/bin/mysql --skip-column-names -e"
dump="/usr/local/bin/mysqldump --single-transaction --quick"
-dump_master="$dump --master-data=2"
-dump_slave="$dump --dump-slave=2 --include-master-host-port"
+dump_master="$dump --master-data=2 --gtid"
+dump_slave="$dump --dump-slave=2 --include-master-host-port --gtid"
$dump_slave -h m2-slave --max_allowed_packet=64M --databases otrs | \
pigz > /srv/backups/m2/otrs-$(date +%Y%m%d%H%M%S).sql.gz
--
To view, visit https://gerrit.wikimedia.org/r/296706
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I548ba5a1a27db81ba00cb7c286df23f11f9be889
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
