Jcrespo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323427
Change subject: Avoid --dump-slave when performing backups
......................................................................
Avoid --dump-slave when performing backups
It is no longer needed, and it stops the slave during the whole
process.
Change-Id: I8bf0fc9e9e8c00d68a7b65123827dfae406426ee
---
M templates/mariadb/dumps-misc.sh.erb
M templates/mariadb/dumps-otrs.sh.erb
2 files changed, 9 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/323427/1
diff --git a/templates/mariadb/dumps-misc.sh.erb
b/templates/mariadb/dumps-misc.sh.erb
index 0e7aefe..24e50d0 100644
--- a/templates/mariadb/dumps-misc.sh.erb
+++ b/templates/mariadb/dumps-misc.sh.erb
@@ -3,32 +3,30 @@
find /srv/backups -mtime +14 -type f -delete
my="/usr/local/bin/mysql --skip-column-names -e"
-dump="/usr/local/bin/mysqldump --single-transaction --quick"
-dump_master="$dump --master-data=2 --gtid --skip-ssl"
-dump_slave="$dump --dump-slave=2 --include-master-host-port --gtid --skip-ssl"
+dump="/usr/local/bin/mysqldump --single-transaction --quick --master-data=2
--gtid --skip-ssl"
-$dump_slave -h m1-slave --databases bacula etherpadlite librenms puppet
racktables rt | \
+$dump -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 | \
+$dump -h m2-slave --databases iegreview reviewdb scholarships | \
pigz > /srv/backups/m2-$(date +%Y%m%d%H%M%S).sql.gz &
# OTRS backup, due to size are handled separatelly (T138915)
-#$dump_slave -h m2-slave --max_allowed_packet=64M --databases otrs | \
+#$dump -h m2-slave --max_allowed_packet=64M --databases otrs | \
# pigz > /srv/backups/m2-otrs-$(date +%Y%m%d%H%M%S).sql.gz &
sql="select schema_name from information_schema.schemata where schema_name
regexp '^(phab|phlegal)'"
-$dump_slave -h m3-slave --ignore-table=phabricator_search.search_documentfield
\
+$dump -h m3-slave --ignore-table=phabricator_search.search_documentfield \
--max_allowed_packet=32M \
--databases $($my "$sql" | tr '\n' ' ') | \
pigz > /srv/backups/m3-phabricator-phlegal-$(date +%Y%m%d%H%M%S).sql.gz
-$dump_slave -h m5-slave --databases ceilometer glance keystone neutron nova \
+$dump -h m5-slave --databases ceilometer glance keystone neutron nova \
designate designate_pool_manager nodepooldb | \
pigz > /srv/backups/m5-$(date +%Y%m%d%H%M%S).sql.gz &
sql="select schema_name from information_schema.schemata where schema_name
regexp '^(wik|flowdb)'"
-$dump_slave -h x1-slave --databases $($my "$sql" | tr '\n' ' ') | \
+$dump -h x1-slave --databases $($my "$sql" | tr '\n' ' ') | \
pigz > /srv/backups/x1-$(date +%Y%m%d%H%M%S).sql.gz
diff --git a/templates/mariadb/dumps-otrs.sh.erb
b/templates/mariadb/dumps-otrs.sh.erb
index 149486a..4fab033 100644
--- a/templates/mariadb/dumps-otrs.sh.erb
+++ b/templates/mariadb/dumps-otrs.sh.erb
@@ -3,10 +3,8 @@
find /srv/backups/m2 -mtime +14 -type f -delete
my="/usr/local/bin/mysql --skip-column-names -e"
-dump="/usr/local/bin/mysqldump --single-transaction --quick"
-dump_master="$dump --master-data=2 --gtid --skip-ssl"
-dump_slave="$dump --dump-slave=2 --include-master-host-port --gtid --skip-ssl"
+dump="/usr/local/bin/mysqldump --single-transaction --quick --master-data=2
--gtid --skip-ssl"
-$dump_slave -h m2-slave.eqiad.wmnet --max_allowed_packet=64M \
+$dump -h m2-slave.eqiad.wmnet --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/323427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8bf0fc9e9e8c00d68a7b65123827dfae406426ee
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
