kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

ignore hashed repositories when doing rake gitlab:cleanup:dirs

Browse source
This commit is contained in:
digitalMoksha 2017-11-24 19:29:25 +01:00
parent b355ebc4c9
commit 17069a9547
2 changed files with 39 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/tasks/gitlab/cleanup.rake
View file

@ -5,7 +5,8 @@ namespace :gitlab do
warn_user_is_not_gitlab warn_user_is_not_gitlab
remove_flag = ENV['REMOVE'] remove_flag = ENV['REMOVE']
namespaces = Namespace.pluck(:path) namespaces = Namespace.pluck(:path)
namespaces << '@hashed' # add so that it will be ignored
Gitlab.config.repositories.storages.each do |name, repository_storage| Gitlab.config.repositories.storages.each do |name, repository_storage|
git_base_path = repository_storage['path'] git_base_path = repository_storage['path']
all_dirs = Dir.glob(git_base_path + '/*') all_dirs = Dir.glob(git_base_path + '/*')

47
spec/tasks/gitlab/cleanup_rake_spec.rb
View file

@ -5,7 +5,8 @@ describe 'gitlab:cleanup rake tasks' do
Rake.application.rake_require 'tasks/gitlab/cleanup' Rake.application.rake_require 'tasks/gitlab/cleanup'
end end
context 'cleanup repositories' do describe 'cleanup' do
let(:gitaly_address) { Gitlab.config.repositories.storages.default.gitaly_address } let(:gitaly_address) { Gitlab.config.repositories.storages.default.gitaly_address }
let(:storages) do let(:storages) do
{ {
@ -22,20 +23,46 @@ describe 'gitlab:cleanup rake tasks' do
FileUtils.rm_rf(Settings.absolute('tmp/tests/default_storage')) FileUtils.rm_rf(Settings.absolute('tmp/tests/default_storage'))
end end
it 'moves it to an orphaned path' do describe 'cleanup:repos' do
FileUtils.mkdir_p(Settings.absolute('tmp/tests/default_storage/broken/project.git')) before do
run_rake_task('gitlab:cleanup:repos') FileUtils.mkdir_p(Settings.absolute('tmp/tests/default_storage/broken/project.git'))
repo_list = Dir['tmp/tests/default_storage/broken/*'] FileUtils.mkdir_p(Settings.absolute('tmp/tests/default_storage/@hashed/12/34/5678.git'))
end
expect(repo_list.first).to include('+orphaned+') it 'moves it to an orphaned path' do
run_rake_task('gitlab:cleanup:repos')
repo_list = Dir['tmp/tests/default_storage/broken/*']
expect(repo_list.first).to include('+orphaned+')
end
it 'ignores @hashed repos' do
run_rake_task('gitlab:cleanup:repos')
expect(Dir.exist?(Settings.absolute('tmp/tests/default_storage/@hashed/12/34/5678.git'))).to be_truthy
end
end end
it 'ignores @hashed repos' do describe 'cleanup:dirs' do
FileUtils.mkdir_p(Settings.absolute('tmp/tests/default_storage/@hashed/12/34/5678.git')) it 'removes missing namespaces' do
FileUtils.mkdir_p(Settings.absolute("tmp/tests/default_storage/namespace_1/project.git"))
FileUtils.mkdir_p(Settings.absolute("tmp/tests/default_storage/namespace_2/project.git"))
allow(Namespace).to receive(:pluck).and_return('namespace_1')
run_rake_task('gitlab:cleanup:repos') stub_env('REMOVE', 'true')
run_rake_task('gitlab:cleanup:dirs')
expect(Dir.exist?(Settings.absolute('tmp/tests/default_storage/@hashed/12/34/5678.git'))).to be_truthy expect(Dir.exist?(Settings.absolute('tmp/tests/default_storage/namespace_1'))).to be_truthy
expect(Dir.exist?(Settings.absolute('tmp/tests/default_storage/namespace_2'))).to be_falsey
end
it 'ignores @hashed directory' do
FileUtils.mkdir_p(Settings.absolute('tmp/tests/default_storage/@hashed/12/34/5678.git'))
run_rake_task('gitlab:cleanup:dirs')
expect(Dir.exist?(Settings.absolute('tmp/tests/default_storage/@hashed/12/34/5678.git'))).to be_truthy
end
end end
end end
end end