Commit 909f9d63 authored by Nick Thomas's avatar Nick Thomas
Browse files

Merge branch 'zj-repository-exist-mandatory' into 'master'

Repository#exists? can only be queried with Gitaly

Closes gitaly#314

See merge request gitlab-org/gitlab-ce!18567
---
title: Repository#exists? is always executed through Gitaly
merge_request:
author:
type: performance
......@@ -142,15 +142,7 @@ def circuit_breaker
end
def exists?
Gitlab::GitalyClient.migrate(:repository_exists, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |enabled|
if enabled
gitaly_repository_client.exists?
else
circuit_breaker.perform do
File.exist?(File.join(path, 'refs'))
end
end
end
gitaly_repository_client.exists?
end
# Returns an Array of branch names
......
......@@ -1224,15 +1224,15 @@ def expect_to_raise_storage_error
end
end
shared_examples 'repo exists check' do
describe '#exists?' do
it 'returns true when a repository exists' do
expect(repository.exists?).to eq(true)
expect(repository.exists?).to be(true)
end
it 'returns false if no full path can be constructed' do
allow(repository).to receive(:full_path).and_return(nil)
expect(repository.exists?).to eq(false)
expect(repository.exists?).to be(false)
end
context 'with broken storage', :broken_storage do
......@@ -1242,16 +1242,6 @@ def expect_to_raise_storage_error
end
end
describe '#exists?' do
context 'when repository_exists is disabled' do
it_behaves_like 'repo exists check'
end
context 'when repository_exists is enabled', :skip_gitaly_mock do
it_behaves_like 'repo exists check'
end
end
describe '#has_visible_content?' do
before do
# If raw_repository.has_visible_content? gets called more than once then
......
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