Commit 7a355f68 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'gitaly-mandatory-20180703-jv-2' into 'master'

Remove more Gitaly feature flags

Closes gitaly#329, gitaly#320, gitaly#323, and gitaly#328

See merge request gitlab-org/gitlab-ce!20343
parents 48bbb363 201802f7
# Gitaly note: JV: 1 RPC, migration in progress.
# Gitlab::Git::CommitStats counts the additions, deletions, and total changes # Gitlab::Git::CommitStats counts the additions, deletions, and total changes
# in a commit. # in a commit.
module Gitlab module Gitlab
...@@ -16,12 +14,8 @@ module Gitlab ...@@ -16,12 +14,8 @@ module Gitlab
@deletions = 0 @deletions = 0
@total = 0 @total = 0
repo.gitaly_migrate(:commit_stats) do |is_enabled| repo.wrapped_gitaly_errors do
if is_enabled
gitaly_stats(repo, commit) gitaly_stats(repo, commit)
else
rugged_stats(commit)
end
end end
end end
...@@ -31,12 +25,6 @@ module Gitlab ...@@ -31,12 +25,6 @@ module Gitlab
@deletions = stats.deletions @deletions = stats.deletions
@total = @additions + @deletions @total = @additions + @deletions
end end
def rugged_stats(commit)
diff = commit.rugged_diff_from_parent
_files_changed, @additions, @deletions = diff.stat
@total = @additions + @deletions
end
end end
end end
end end
...@@ -251,7 +251,6 @@ module Gitlab ...@@ -251,7 +251,6 @@ module Gitlab
# Returns an Array of Tags # Returns an Array of Tags
# #
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/390
def tags def tags
wrapped_gitaly_errors do wrapped_gitaly_errors do
gitaly_ref_client.tags gitaly_ref_client.tags
...@@ -598,17 +597,9 @@ module Gitlab ...@@ -598,17 +597,9 @@ module Gitlab
# @repository.submodule_url_for('master', 'rack') # @repository.submodule_url_for('master', 'rack')
# # => git@localhost:rack.git # # => git@localhost:rack.git
# #
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/329
def submodule_url_for(ref, path) def submodule_url_for(ref, path)
Gitlab::GitalyClient.migrate(:submodule_url_for) do |is_enabled| wrapped_gitaly_errors do
if is_enabled
gitaly_submodule_url_for(ref, path) gitaly_submodule_url_for(ref, path)
else
if submodules(ref).any?
submodule = submodules(ref)[path]
submodule['url'] if submodule
end
end
end end
end end
...@@ -833,22 +824,14 @@ module Gitlab ...@@ -833,22 +824,14 @@ module Gitlab
# Ex. # Ex.
# repo.ls_files('master') # repo.ls_files('master')
# #
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/327
def ls_files(ref) def ls_files(ref)
gitaly_commit_client.ls_files(ref) gitaly_commit_client.ls_files(ref)
end end
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/328
def copy_gitattributes(ref) def copy_gitattributes(ref)
Gitlab::GitalyClient.migrate(:apply_gitattributes) do |is_enabled| wrapped_gitaly_errors do
if is_enabled gitaly_repository_client.apply_gitattributes(ref)
gitaly_copy_gitattributes(ref)
else
rugged_copy_gitattributes(ref)
end
end end
rescue GRPC::InvalidArgument
raise InvalidRef
end end
def info_attributes def info_attributes
......
# Gitaly note: JV: needs 1 RPC, migration is in progress.
module Gitlab module Gitlab
module Git module Git
class Tree class Tree
...@@ -17,12 +15,8 @@ module Gitlab ...@@ -17,12 +15,8 @@ module Gitlab
def where(repository, sha, path = nil, recursive = false) def where(repository, sha, path = nil, recursive = false)
path = nil if path == '' || path == '/' path = nil if path == '' || path == '/'
Gitlab::GitalyClient.migrate(:tree_entries) do |is_enabled| repository.wrapped_gitaly_errors do
if is_enabled
repository.gitaly_commit_client.tree_entries(repository, sha, path, recursive) repository.gitaly_commit_client.tree_entries(repository, sha, path, recursive)
else
tree_entries_from_rugged(repository, sha, path, recursive)
end
end end
end end
......
...@@ -48,6 +48,8 @@ module Gitlab ...@@ -48,6 +48,8 @@ module Gitlab
def apply_gitattributes(revision) def apply_gitattributes(revision)
request = Gitaly::ApplyGitattributesRequest.new(repository: @gitaly_repo, revision: encode_binary(revision)) request = Gitaly::ApplyGitattributesRequest.new(repository: @gitaly_repo, revision: encode_binary(revision))
GitalyClient.call(@storage, :repository_service, :apply_gitattributes, request) GitalyClient.call(@storage, :repository_service, :apply_gitattributes, request)
rescue GRPC::InvalidArgument => ex
raise Gitlab::Git::Repository::InvalidRef, ex
end end
def info_attributes def info_attributes
......
...@@ -1402,7 +1402,6 @@ describe Gitlab::Git::Repository, seed_helper: true do ...@@ -1402,7 +1402,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
end end
describe "#copy_gitattributes" do describe "#copy_gitattributes" do
shared_examples 'applying git attributes' do
let(:attributes_path) { File.join(SEED_STORAGE_PATH, TEST_REPO_PATH, 'info/attributes') } let(:attributes_path) { File.join(SEED_STORAGE_PATH, TEST_REPO_PATH, 'info/attributes') }
after do after do
...@@ -1484,15 +1483,6 @@ describe Gitlab::Git::Repository, seed_helper: true do ...@@ -1484,15 +1483,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
end end
end end
context 'when gitaly is enabled' do
it_behaves_like 'applying git attributes'
end
context 'when gitaly is disabled', :disable_gitaly do
it_behaves_like 'applying git attributes'
end
end
describe '#ref_exists?' do describe '#ref_exists?' do
shared_examples 'checks the existence of refs' do shared_examples 'checks the existence of refs' do
it 'returns true for an existing tag' do it 'returns true for an existing tag' 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