Commit 2ce49b53 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '32796-tighten-up-remove-old-while-backing-up-gitlab' into 'master'

Tighten up remove_old regex from gitlab backup manager.

Closes #32796

See merge request gitlab-org/gitlab-ce!14333
parents ff1deab6 0a606988
...@@ -79,7 +79,7 @@ module Backup ...@@ -79,7 +79,7 @@ module Backup
# - 1495527122_gitlab_backup.tar # - 1495527122_gitlab_backup.tar
# - 1495527068_2017_05_23_gitlab_backup.tar # - 1495527068_2017_05_23_gitlab_backup.tar
# - 1495527097_2017_05_23_9.3.0-pre_gitlab_backup.tar # - 1495527097_2017_05_23_9.3.0-pre_gitlab_backup.tar
next unless file =~ /(\d+)(?:_\d{4}_\d{2}_\d{2}(_\d+\.\d+\.\d+.*)?)?_gitlab_backup\.tar$/ next unless file =~ /^(\d{10})(?:_\d{4}_\d{2}_\d{2}(_\d+\.\d+\.\d+((-|\.)(pre|rc\d))?)?)?_gitlab_backup\.tar$/
timestamp = $1.to_i timestamp = $1.to_i
......
...@@ -26,6 +26,8 @@ describe Backup::Manager do ...@@ -26,6 +26,8 @@ describe Backup::Manager do
[ [
'1451606400_2016_01_01_1.2.3_gitlab_backup.tar', '1451606400_2016_01_01_1.2.3_gitlab_backup.tar',
'1451520000_2015_12_31_4.5.6_gitlab_backup.tar', '1451520000_2015_12_31_4.5.6_gitlab_backup.tar',
'1451520000_2015_12_31_4.5.6-pre_gitlab_backup.tar',
'1451520000_2015_12_31_4.5.6-rc1_gitlab_backup.tar',
'1451510000_2015_12_30_gitlab_backup.tar', '1451510000_2015_12_30_gitlab_backup.tar',
'1450742400_2015_12_22_gitlab_backup.tar', '1450742400_2015_12_22_gitlab_backup.tar',
'1449878400_gitlab_backup.tar', '1449878400_gitlab_backup.tar',
...@@ -57,6 +59,30 @@ describe Backup::Manager do ...@@ -57,6 +59,30 @@ describe Backup::Manager do
end end
end end
context 'when no valid file is found' do
let(:files) do
[
'14516064000_2016_01_01_1.2.3_gitlab_backup.tar',
'foo_1451520000_2015_12_31_4.5.6_gitlab_backup.tar',
'1451520000_2015_12_31_4.5.6-foo_gitlab_backup.tar'
]
end
before do
allow(Gitlab.config.backup).to receive(:keep_time).and_return(1)
subject.remove_old
end
it 'removes no files' do
expect(FileUtils).not_to have_received(:rm)
end
it 'prints a done message' do
expect(progress).to have_received(:puts).with('done. (0 removed)')
end
end
context 'when there are no files older than keep_time' do context 'when there are no files older than keep_time' do
before do before do
# Set to 30 days # Set to 30 days
...@@ -84,28 +110,30 @@ describe Backup::Manager do ...@@ -84,28 +110,30 @@ describe Backup::Manager do
it 'removes matching files with a human-readable versioned timestamp' do it 'removes matching files with a human-readable versioned timestamp' do
expect(FileUtils).to have_received(:rm).with(files[1]) expect(FileUtils).to have_received(:rm).with(files[1])
end
it 'removes matching files with a human-readable non-versioned timestamp' do
expect(FileUtils).to have_received(:rm).with(files[2]) expect(FileUtils).to have_received(:rm).with(files[2])
expect(FileUtils).to have_received(:rm).with(files[3]) expect(FileUtils).to have_received(:rm).with(files[3])
end end
it 'removes matching files without a human-readable timestamp' do it 'removes matching files with a human-readable non-versioned timestamp' do
expect(FileUtils).to have_received(:rm).with(files[4]) expect(FileUtils).to have_received(:rm).with(files[4])
expect(FileUtils).to have_received(:rm).with(files[5]) expect(FileUtils).to have_received(:rm).with(files[5])
end end
it 'removes matching files without a human-readable timestamp' do
expect(FileUtils).to have_received(:rm).with(files[6])
expect(FileUtils).to have_received(:rm).with(files[7])
end
it 'does not remove files that are not old enough' do it 'does not remove files that are not old enough' do
expect(FileUtils).not_to have_received(:rm).with(files[0]) expect(FileUtils).not_to have_received(:rm).with(files[0])
end end
it 'does not remove non-matching files' do it 'does not remove non-matching files' do
expect(FileUtils).not_to have_received(:rm).with(files[6]) expect(FileUtils).not_to have_received(:rm).with(files[8])
end end
it 'prints a done message' do it 'prints a done message' do
expect(progress).to have_received(:puts).with('done. (5 removed)') expect(progress).to have_received(:puts).with('done. (7 removed)')
end end
end end
...@@ -121,14 +149,14 @@ describe Backup::Manager do ...@@ -121,14 +149,14 @@ describe Backup::Manager do
end end
it 'removes the remaining expected files' do it 'removes the remaining expected files' do
expect(FileUtils).to have_received(:rm).with(files[2])
expect(FileUtils).to have_received(:rm).with(files[3])
expect(FileUtils).to have_received(:rm).with(files[4]) expect(FileUtils).to have_received(:rm).with(files[4])
expect(FileUtils).to have_received(:rm).with(files[5]) expect(FileUtils).to have_received(:rm).with(files[5])
expect(FileUtils).to have_received(:rm).with(files[6])
expect(FileUtils).to have_received(:rm).with(files[7])
end end
it 'sets the correct removed count' do it 'sets the correct removed count' do
expect(progress).to have_received(:puts).with('done. (4 removed)') expect(progress).to have_received(:puts).with('done. (6 removed)')
end end
it 'prints the error from file that could not be removed' do it 'prints the error from file that could not be removed' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment