Commit b3930ff7 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch '291063-remove-pages_use_legacy_storage_lease-feature-flag' into 'master'

Remove pages_use_legacy_storage_lease feature flag [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!54421
parents e1c3fb41 d90e9380
...@@ -8,15 +8,6 @@ module Pages ...@@ -8,15 +8,6 @@ module Pages
LEASE_TIMEOUT = 1.hour LEASE_TIMEOUT = 1.hour
# override method from exclusive lease guard to guard it by feature flag
# TODO: just remove this method after testing this in production
# https://gitlab.com/gitlab-org/gitlab/-/issues/282464
def try_obtain_lease
return yield unless Feature.enabled?(:pages_use_legacy_storage_lease, project, default_enabled: true)
super
end
def lease_key def lease_key
"pages_legacy_storage:#{project.id}" "pages_legacy_storage:#{project.id}"
end end
......
---
name: pages_use_legacy_storage_lease
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48349
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/282464
milestone: '13.7'
type: development
group: group::release
default_enabled: true
...@@ -47,14 +47,6 @@ RSpec.describe ::Pages::LegacyStorageLease do ...@@ -47,14 +47,6 @@ RSpec.describe ::Pages::LegacyStorageLease do
expect(service.execute).to eq(nil) expect(service.execute).to eq(nil)
end end
it 'runs guarded method if feature flag is disabled' do
stub_feature_flags(pages_use_legacy_storage_lease: false)
expect(service).to receive(:execute_unsafe).and_call_original
expect(service.execute).to eq(true)
end
end end
context 'when another service holds the lease for the different project' do context 'when another service holds the lease for the different project' 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