Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
981dd7a909a9
Commit
09908958
authored
Aug 21, 2018
by
Gabriel Mazetto
Browse files
Rename feature flag to skip_hashed_storage_upgrade to be less confusing
parent
a9ed2f34f010
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/models/project.rb
View file @
981dd7a9
...
...
@@ -2074,7 +2074,7 @@ def auto_cancel_pending_pipelines?
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
...
...
spec/models/project_spec.rb
View file @
981dd7a9
...
...
@@ -2989,7 +2989,7 @@ def enable_lfs
# 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 @@ def enable_lfs
# 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
...
...
spec/services/projects/update_service_spec.rb
View file @
981dd7a9
...
...
@@ -262,7 +262,7 @@
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 @@
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment