kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'gitaly-opt-out-branch-tag' into 'master'

Browse source 
Move Gitaly branch/tag/ref RPC's to opt-out

See merge request gitlab-org/gitlab-ce!19644
This commit is contained in:
Sean McGivern 2018-06-12 09:24:05 +00:00
commit b6fdf19ee6
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/gitaly-opt-out-branch-tag.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Move Gitaly branch/tag/ref RPC's to opt-out
merge_request: 19644
author:
type: other

16
lib/gitlab/git/repository.rb
View file

@ -120,7 +120,7 @@ module Gitlab
# Default branch in the repository # Default branch in the repository
def root_ref def root_ref
@root_ref ||= gitaly_migrate(:root_ref) do |is_enabled| @root_ref ||= gitaly_migrate(:root_ref, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled if is_enabled
gitaly_ref_client.default_branch_name gitaly_ref_client.default_branch_name
else else
@ -152,7 +152,7 @@ module Gitlab
# Returns an Array of branch names # Returns an Array of branch names
# sorted by name ASC # sorted by name ASC
def branch_names def branch_names
gitaly_migrate(:branch_names) do |is_enabled| gitaly_migrate(:branch_names, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled if is_enabled
gitaly_ref_client.branch_names gitaly_ref_client.branch_names
else else
@ -163,7 +163,7 @@ module Gitlab
# Returns an Array of Branches # Returns an Array of Branches
def branches def branches
gitaly_migrate(:branches) do |is_enabled| gitaly_migrate(:branches, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled if is_enabled
gitaly_ref_client.branches gitaly_ref_client.branches
else else
@ -200,7 +200,7 @@ module Gitlab
end end
def local_branches(sort_by: nil) def local_branches(sort_by: nil)
gitaly_migrate(:local_branches) do |is_enabled| gitaly_migrate(:local_branches, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled if is_enabled
gitaly_ref_client.local_branches(sort_by: sort_by) gitaly_ref_client.local_branches(sort_by: sort_by)
else else
@ -270,7 +270,7 @@ module Gitlab
# Returns an Array of tag names # Returns an Array of tag names
def tag_names def tag_names
gitaly_migrate(:tag_names) do |is_enabled| gitaly_migrate(:tag_names, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled if is_enabled
gitaly_ref_client.tag_names gitaly_ref_client.tag_names
else else
@ -283,7 +283,7 @@ module Gitlab
# #
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/390 # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/390
def tags def tags
gitaly_migrate(:tags) do |is_enabled| gitaly_migrate(:tags, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled if is_enabled
tags_from_gitaly tags_from_gitaly
else else
@ -310,7 +310,7 @@ module Gitlab
# #
# name - The name of the tag as a String. # name - The name of the tag as a String.
def tag_exists?(name) def tag_exists?(name)
gitaly_migrate(:ref_exists_tags) do |is_enabled| gitaly_migrate(:ref_exists_tags, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled if is_enabled
gitaly_ref_exists?("refs/tags/#{name}") gitaly_ref_exists?("refs/tags/#{name}")
else else
@ -323,7 +323,7 @@ module Gitlab
# #
# name - The name of the branch as a String. # name - The name of the branch as a String.
def branch_exists?(name) def branch_exists?(name)
gitaly_migrate(:ref_exists_branches) do |is_enabled| gitaly_migrate(:ref_exists_branches, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled if is_enabled
gitaly_ref_exists?("refs/heads/#{name}") gitaly_ref_exists?("refs/heads/#{name}")
else else