From e3a36fec3f23e6ee8f613570c066eb52011b75fc Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 17 Aug 2020 18:42:12 +0100 Subject: [PATCH] Don't try and dump tablespaces in mysql backups --- cookbooks/forum/templates/default/backup.cron.erb | 2 +- cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbooks/forum/templates/default/backup.cron.erb b/cookbooks/forum/templates/default/backup.cron.erb index db4f0b412..517f71634 100644 --- a/cookbooks/forum/templates/default/backup.cron.erb +++ b/cookbooks/forum/templates/default/backup.cron.erb @@ -10,7 +10,7 @@ mkdir $T/forum-$D echo '[mysqldump]' > $T/mysqldump.opts echo 'user=forum' >> $T/mysqldump.opts echo 'password=<%= @passwords["database"] %>' >> $T/mysqldump.opts -mysqldump --defaults-file=$T/mysqldump.opts --opt forum > $T/forum-$D/forum.sql +mysqldump --defaults-file=$T/mysqldump.opts --opt --no-tablespaces forum > $T/forum-$D/forum.sql ln -s /srv/forum.openstreetmap.org $T/forum-$D/www export RSYNC_RSH="ssh -ax" diff --git a/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb b/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb index cd6f3c6e4..cb4eb9ab9 100755 --- a/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb +++ b/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb @@ -7,7 +7,7 @@ mkdir $T/wiki-<%= @name %>-$D echo '[mysqldump]' > $T/mysqldump.opts echo 'user=<%= @database_params[:username] %>' >> $T/mysqldump.opts echo 'password=<%= @database_params[:password] %>' >> $T/mysqldump.opts -mysqldump --defaults-file=$T/mysqldump.opts --opt --skip-lock-tables --single-transaction "<%= @database_params[:name] %>" | lz4 -9 > $T/wiki-<%= @name %>-$D/wiki.sql.lz4 +mysqldump --defaults-file=$T/mysqldump.opts --opt --skip-lock-tables --single-transaction --no-tablespaces "<%= @database_params[:name] %>" | lz4 -9 > $T/wiki-<%= @name %>-$D/wiki.sql.lz4 ln -s <%= @directory %> $T/wiki-<%= @name %>-$D/www nice tar --create --dereference --directory=$T --warning=no-file-changed --exclude=wiki-<%= @name %>-$D/www/w/images/thumb --exclude=wiki-<%= @name %>-$D/www/w/.git --exclude=wiki-<%= @name %>-$D/www/w/extensions/*/.git wiki-<%= @name %>-$D | nice gzip --rsyncable -9 > $T/$B nice rsync --preallocate --fuzzy $T/$B backup::backup -- 2.43.2