Skip to content

Make incremental backups deactivable #1188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2019
Merged

Make incremental backups deactivable #1188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions manifests/backup/xtrabackup.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
$postscript = false,
$execpath = '/usr/bin:/usr/sbin:/bin:/sbin',
$optional_args = [],
$additional_cron_args = '--backup'
$additional_cron_args = '--backup',
$incremental_backups = true
) inherits mysql::params {

ensure_packages($xtrabackup_package_name)
Expand All @@ -47,23 +48,36 @@
}
}

cron { 'xtrabackup-weekly':
ensure => $ensure,
command => "/usr/local/sbin/xtrabackup.sh --target-dir=${backupdir} ${additional_cron_args}",
user => 'root',
hour => $time[0],
minute => $time[1],
weekday => '0',
require => Package[$xtrabackup_package_name],
if $incremental_backups {
cron { 'xtrabackup-weekly':
ensure => $ensure,
command => "/usr/local/sbin/xtrabackup.sh --target-dir=${backupdir} ${additional_cron_args}",
user => 'root',
hour => $time[0],
minute => $time[1],
weekday => '0',
require => Package[$xtrabackup_package_name],
}
}

$daily_cron_data = ($incremental_backups) ? {
true => {
'directories' => "--incremental-basedir=${backupdir} --target-dir=${backupdir}/`date +%F_%H-%M-%S`",
'weekday' => '1-6',
},
false => {
'directories' => "--target-dir=${backupdir}",
'weekday' => '*',
},
}

cron { 'xtrabackup-daily':
ensure => $ensure,
command => "/usr/local/sbin/xtrabackup.sh --incremental-basedir=${backupdir} --target-dir=${backupdir}/`date +%F_%H-%M-%S` ${additional_cron_args}",
command => "/usr/local/sbin/xtrabackup.sh ${daily_cron_data['directories']} ${additional_cron_args}",
user => 'root',
hour => $time[0],
minute => $time[1],
weekday => '1-6',
weekday => $daily_cron_data['weekday'],
require => Package[$xtrabackup_package_name],
}

Expand Down
175 changes: 175 additions & 0 deletions spec/classes/mysql_backup_xtrabackup_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
require 'spec_helper'

describe 'mysql::backup::xtrabackup' do
on_supported_os.each do |os, facts|
context "on #{os}" do
let(:pre_condition) do
<<-EOF
class { 'mysql::server': }
EOF
end
let(:facts) do
facts.merge(root_home: '/root')
end

let(:default_params) do
{ 'backupdir' => '/tmp' }
end

context 'with defaults' do
let(:params) do
default_params
end

it 'contains the wrapper script' do
is_expected.to contain_file('xtrabackup.sh').with_content(
%r{(\n*^xtrabackup\s+.*\$@)},
)
end

it 'contains the weekly cronjob' do
is_expected.to contain_cron('xtrabackup-weekly')
.with(
ensure: 'present',
command: '/usr/local/sbin/xtrabackup.sh --target-dir=/tmp --backup',
user: 'root',
hour: '23',
minute: '5',
weekday: '0',
)
.that_requires('Package[percona-xtrabackup]')
end

it 'contains the daily cronjob for weekdays 1-6' do
is_expected.to contain_cron('xtrabackup-daily')
.with(
ensure: 'present',
command: '/usr/local/sbin/xtrabackup.sh --incremental-basedir=/tmp --target-dir=/tmp/`date +%F_%H-%M-%S` --backup',
user: 'root',
hour: '23',
minute: '5',
weekday: '1-6',
)
.that_requires('Package[percona-xtrabackup]')
end
end

context 'with backupuser and backuppassword' do
let(:params) do
{ backupuser: 'backupuser',
backuppassword: 'backuppassword' }.merge(default_params)
end

it 'contains the defined mysql user' do
is_expected.to contain_mysql_user('backupuser@localhost')
.with(
ensure: 'present',
password_hash: '*4110E08DF51E70A4BA1D4E33A84205E38CF3FE58',
)
.that_requires('Class[mysql::server::root_password]')

is_expected.to contain_mysql_grant('backupuser@localhost/*.*')
.with(
ensure: 'present',
user: 'backupuser@localhost',
table: '*.*',
privileges: ['RELOAD', 'PROCESS', 'LOCK TABLES', 'REPLICATION CLIENT'],
)
.that_requires('Mysql_user[backupuser@localhost]')
end
end

context 'with additional cron args' do
let(:params) do
{ additional_cron_args: '--backup --skip-ssl' }.merge(default_params)
end

it 'contains the weekly cronjob' do
is_expected.to contain_cron('xtrabackup-weekly')
.with(
ensure: 'present',
command: '/usr/local/sbin/xtrabackup.sh --target-dir=/tmp --backup --skip-ssl',
user: 'root',
hour: '23',
minute: '5',
weekday: '0',
)
.that_requires('Package[percona-xtrabackup]')
end

it 'contains the daily cronjob for weekdays 1-6' do
is_expected.to contain_cron('xtrabackup-daily')
.with(
ensure: 'present',
command: '/usr/local/sbin/xtrabackup.sh --incremental-basedir=/tmp --target-dir=/tmp/`date +%F_%H-%M-%S` --backup --skip-ssl',
user: 'root',
hour: '23',
minute: '5',
weekday: '1-6',
)
.that_requires('Package[percona-xtrabackup]')
end
end

context 'with deactivated incremental backups' do
let(:params) do
{ incremental_backups: false }.merge(default_params)
end

it 'not contains the weekly cronjob' do
is_expected.not_to contain_cron('xtrabackup-weekly')
end

it 'contains the daily cronjob with all weekdays' do
is_expected.to contain_cron('xtrabackup-daily').with(
ensure: 'present',
command: '/usr/local/sbin/xtrabackup.sh --target-dir=/tmp --backup',
user: 'root',
hour: '23',
minute: '5',
weekday: '*',
)
end
end

context 'with prescript defined' do
let(:params) do
{ prescript: ['rsync -a /tmp backup01.local-lan:',
'rsync -a /tmp backup02.local-lan:'] }.merge(default_params)
end

it 'contains the prescript' do
is_expected.to contain_file('xtrabackup.sh').with_content(
%r{.*rsync -a \/tmp backup01.local-lan:\n\nrsync -a \/tmp backup02.local-lan:.*},
)
end
end

context 'with postscript defined' do
let(:params) do
{ postscript: ['rsync -a /tmp backup01.local-lan:',
'rsync -a /tmp backup02.local-lan:'] }.merge(default_params)
end

it 'contains the prostscript' do
is_expected.to contain_file('xtrabackup.sh').with_content(
%r{.*rsync -a \/tmp backup01.local-lan:\n\nrsync -a \/tmp backup02.local-lan:.*},
)
end
end

context 'with mariabackup' do
let(:params) do
{ backupmethod: 'mariabackup' }.merge(default_params)
end

it 'contain the mariabackup executor' do
is_expected.to contain_file('xtrabackup.sh').with_content(
%r{(\n*^mariabackup\s+.*\$@)},
)
end
end
end
end
# rubocop:enable RSpec/NestedGroups
end
56 changes: 0 additions & 56 deletions spec/classes/mysql_server_backup_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,62 +355,6 @@ class { 'mysql::server': }
)
end
end

context 'with the xtrabackup provider' do
let(:params) do
default_params.merge(provider: 'xtrabackup')
end

it 'contains the wrapper script' do
is_expected.to contain_file('xtrabackup.sh').with_content(
%r{(\n*^xtrabackup\s+.*\$@)},
)
end

context 'with prescript defined' do
let(:params) do
default_params.merge(provider: 'xtrabackup',
prescript: [
'rsync -a /tmp backup01.local-lan:',
'rsync -a /tmp backup02.local-lan:',
])
end

it 'contains the prescript' do
is_expected.to contain_file('xtrabackup.sh').with_content(
%r{.*rsync -a \/tmp backup01.local-lan:\n\nrsync -a \/tmp backup02.local-lan:.*},
)
end
end

context 'with postscript defined' do
let(:params) do
default_params.merge(provider: 'xtrabackup',
postscript: [
'rsync -a /tmp backup01.local-lan:',
'rsync -a /tmp backup02.local-lan:',
])
end

it 'contains the prostscript' do
is_expected.to contain_file('xtrabackup.sh').with_content(
%r{.*rsync -a \/tmp backup01.local-lan:\n\nrsync -a \/tmp backup02.local-lan:.*},
)
end
end
context 'with mariabackup' do
let(:params) do
default_params.merge(provider: 'xtrabackup',
backupmethod: 'mariabackup')
end

it 'contain the mariabackup executor' do
is_expected.to contain_file('xtrabackup.sh').with_content(
%r{(\n*^mariabackup\s+.*\$@)},
)
end
end
end
end
end
# rubocop:enable RSpec/NestedGroups
Expand Down