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

Merge branch 'gitaly-commit-count-opt-out' into 'master'

Browse source 
Move gitaly_blame,  gitaly_count_commits, gitaly_commit_count to opt-out

See merge request gitlab-org/gitlab-ce!19591
This commit is contained in:
Sean McGivern 2018-06-11 10:39:23 +00:00
commit 8742af1e58
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/gitaly-commit-count-opt-out.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Move some Gitaly RPC's to opt-out
merge_request: 19591
author:
type: other

2
lib/gitlab/git/blame.rb
View file

@ -22,7 +22,7 @@ module Gitlab
private
def load_blame
raw_output = @repo.gitaly_migrate(:blame) do |is_enabled|
raw_output = @repo.gitaly_migrate(:blame, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled
load_blame_by_gitaly
else

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

@ -533,7 +533,7 @@ module Gitlab
def count_commits(options)
count_commits_options = process_count_commits_options(options)
gitaly_migrate(:count_commits) do |is_enabled|
gitaly_migrate(:count_commits, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled
count_commits_by_gitaly(count_commits_options)
else
@ -738,7 +738,7 @@ module Gitlab
#
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/330
def commit_count(ref)
gitaly_migrate(:commit_count) do |is_enabled|
gitaly_migrate(:commit_count, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled
gitaly_commit_client.commit_count(ref)
else