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

Rename feature flag to skip_hashed_storage_upgrade to be less confusing

Browse source
This commit is contained in:
Gabriel Mazetto 2018-08-21 20:41:22 +02:00
parent 61c35b6ca1
commit 7b7969bf15
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/project.rb
View file

@ -2074,7 +2074,7 @@ class Project < ActiveRecord::Base
def rename_or_migrate_repository!
if Gitlab::CurrentSettings.hashed_storage_enabled? &&
storage_upgradable? &&
Feature.disabled?(:disable_hashed_storage_upgrade) # kill switch in case we need to disable upgrade behavior
Feature.disabled?(:skip_hashed_storage_upgrade) # kill switch in case we need to disable upgrade behavior
::Projects::HashedStorageMigrationService.new(self, full_path_was).execute
else
storage.rename_repo

4
spec/models/project_spec.rb
View file

@ -2989,7 +2989,7 @@ describe Project do
# call. This makes testing a bit easier.
allow(project).to receive(:gitlab_shell).and_return(gitlab_shell)
allow(project).to receive(:previous_changes).and_return('path' => ['foo'])
stub_feature_flags(disable_hashed_storage_upgrade: false)
stub_feature_flags(skip_hashed_storage_upgrade: false)
end
it 'renames a repository' do
@ -3161,7 +3161,7 @@ describe Project do
# call. This makes testing a bit easier.
allow(project).to receive(:gitlab_shell).and_return(gitlab_shell)
allow(project).to receive(:previous_changes).and_return('path' => ['foo'])
stub_feature_flags(disable_hashed_storage_upgrade: false)
stub_feature_flags(skip_hashed_storage_upgrade: false)
end
context 'migration to hashed storage' do

6
spec/services/projects/update_service_spec.rb
View file

@ -262,7 +262,7 @@ describe Projects::UpdateService do
context 'when hashed storage is enabled' do
before do
stub_application_setting(hashed_storage_enabled: true)
stub_feature_flags(disable_hashed_storage_upgrade: false)
stub_feature_flags(skip_hashed_storage_upgrade: false)
end
it 'migrates project to a hashed storage instead of renaming the repo to another legacy name' do
@ -274,9 +274,9 @@ describe Projects::UpdateService do
expect(project.reload.hashed_storage?(:repository)).to be_truthy
end
context 'when disable_hashed_storage_upgrade feature flag is enabled' do
context 'when skip_hashed_storage_upgrade feature flag is enabled' do
before do
stub_feature_flags(disable_hashed_storage_upgrade: true)
stub_feature_flags(skip_hashed_storage_upgrade: true)
end
it 'renames the project without upgrading it' do