Commit e787e52a authored by Stan Hu's avatar Stan Hu

Merge branch '6692-remove-geo-redownload-feature-flag' into 'master'

Resolve "Remove Geo snapshot feature flag"

Closes #6692

See merge request gitlab-org/gitlab-ee!6286
parents d0e5b349 1e17b30f
...@@ -117,8 +117,6 @@ module Geo ...@@ -117,8 +117,6 @@ module Geo
# will be enqueued by the log cursor, which should resolve any problems # will be enqueued by the log cursor, which should resolve any problems
# it is possible to fix. # it is possible to fix.
def fetch_snapshot def fetch_snapshot
return unless Feature.enabled?(:geo_redownload_with_snapshot)
log_info("Attempting to fetch repository via snapshot") log_info("Attempting to fetch repository via snapshot")
temp_repo.create_from_snapshot( temp_repo.create_from_snapshot(
......
---
title: Enable Geo snapshot synchronization for everyone
merge_request: 6286
author:
type: other
...@@ -74,30 +74,6 @@ shared_examples 'geo base sync fetch and repack' do ...@@ -74,30 +74,6 @@ shared_examples 'geo base sync fetch and repack' do
fetch_repository fetch_repository
end end
context 'redownload' do
let(:fetch_repository) { subject.send(:fetch_repository, true) }
before do
stub_feature_flags(geo_redownload_with_snapshot: false)
end
it 'fetches repository from geo node into temporary location' do
temporary_repository = instance_double('Repository')
is_expected.to receive(:temp_repo) { temporary_repository }
is_expected.to receive(:fetch_geo_mirror).with(temporary_repository)
is_expected.to receive(:set_temp_repository_as_main)
fetch_repository
end
it 'schedule git repack' do
is_expected.to receive(:schedule_repack)
fetch_repository
end
end
context 'repository does not exist' do context 'repository does not exist' do
before do before do
allow_any_instance_of(Repository).to receive(:exists?) { false } allow_any_instance_of(Repository).to receive(:exists?) { false }
...@@ -162,15 +138,6 @@ shared_examples 'sync retries use the snapshot RPC' do ...@@ -162,15 +138,6 @@ shared_examples 'sync retries use the snapshot RPC' do
subject.execute subject.execute
end end
it 'does not attempt to snapshot if the feature flag is disabled' do
stub_feature_flags(geo_redownload_with_snapshot: false)
expect(repository).not_to receive_create_from_snapshot
expect(subject).to receive(:fetch_geo_mirror).with(repository)
subject.execute
end
end end
end end
end end
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