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

Make all workhorse gitaly calls opt-out

Browse source
This commit is contained in:
Jacob Vosmaer (GitLab) 2018-03-27 10:47:15 +00:00 committed by Sean McGivern
parent 1d7ca03390
commit f432fb9a4f
3 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/workhorse-gitaly-mandatory.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Make all workhorse gitaly calls opt-out
merge_request: 18002
author:
type: other

8
lib/gitlab/workhorse.rb
View file

@ -52,7 +52,7 @@ module Gitlab
end
def send_git_blob(repository, blob)
params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_raw_show)
params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_raw_show, Gitlab::GitalyClient::MigrationStatus::OPT_OUT)
{
'GitalyServer' => gitaly_server_hash(repository),
'GetBlobRequest' => {
@ -80,7 +80,7 @@ module Gitlab
params = repository.archive_metadata(ref, Gitlab.config.gitlab.repository_downloads_path, format)
raise "Repository or ref not found" if params.empty?
if Gitlab::GitalyClient.feature_enabled?(:workhorse_archive)
if Gitlab::GitalyClient.feature_enabled?(:workhorse_archive, Gitlab::GitalyClient::MigrationStatus::OPT_OUT)
params.merge!(
'GitalyServer' => gitaly_server_hash(repository),
'GitalyRepository' => repository.gitaly_repository.to_h
@ -97,7 +97,7 @@ module Gitlab
end
def send_git_diff(repository, diff_refs)
params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_diff)
params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_diff, Gitlab::GitalyClient::MigrationStatus::OPT_OUT)
{
'GitalyServer' => gitaly_server_hash(repository),
'RawDiffRequest' => Gitaly::RawDiffRequest.new(
@ -115,7 +115,7 @@ module Gitlab
end
def send_git_patch(repository, diff_refs)
params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_patch)
params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_patch, Gitlab::GitalyClient::MigrationStatus::OPT_OUT)
{
'GitalyServer' => gitaly_server_hash(repository),
'RawPatchRequest' => Gitaly::RawPatchRequest.new(

8
spec/lib/gitlab/workhorse_spec.rb
View file

@ -55,7 +55,7 @@ describe Gitlab::Workhorse do
end
end
context 'when Gitaly workhorse_archive feature is disabled', :skip_gitaly_mock do
context 'when Gitaly workhorse_archive feature is disabled', :disable_gitaly do
it 'sets the header correctly' do
key, command, params = decode_workhorse_header(subject)
@ -100,7 +100,7 @@ describe Gitlab::Workhorse do
end
end
context 'when Gitaly workhorse_send_git_patch feature is disabled', :skip_gitaly_mock do
context 'when Gitaly workhorse_send_git_patch feature is disabled', :disable_gitaly do
it 'sets the header correctly' do
key, command, params = decode_workhorse_header(subject)
@ -173,7 +173,7 @@ describe Gitlab::Workhorse do
end
end
context 'when Gitaly workhorse_send_git_diff feature is disabled', :skip_gitaly_mock do
context 'when Gitaly workhorse_send_git_diff feature is disabled', :disable_gitaly do
it 'sets the header correctly' do
key, command, params = decode_workhorse_header(subject)
@ -455,7 +455,7 @@ describe Gitlab::Workhorse do
end
end
context 'when Gitaly workhorse_raw_show feature is disabled', :skip_gitaly_mock do
context 'when Gitaly workhorse_raw_show feature is disabled', :disable_gitaly do
it 'sets the header correctly' do
key, command, params = decode_workhorse_header(subject)