Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
f432fb9a
Commit
f432fb9a
authored
Mar 27, 2018
by
Jacob Vosmaer (GitLab)
Committed by
Sean McGivern
Mar 27, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make all workhorse gitaly calls opt-out
parent
1d7ca033
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
8 deletions
+13
-8
changelogs/unreleased/workhorse-gitaly-mandatory.yml
changelogs/unreleased/workhorse-gitaly-mandatory.yml
+5
-0
lib/gitlab/workhorse.rb
lib/gitlab/workhorse.rb
+4
-4
spec/lib/gitlab/workhorse_spec.rb
spec/lib/gitlab/workhorse_spec.rb
+4
-4
No files found.
changelogs/unreleased/workhorse-gitaly-mandatory.yml
0 → 100644
View file @
f432fb9a
---
title
:
Make all workhorse gitaly calls opt-out
merge_request
:
18002
author
:
type
:
other
lib/gitlab/workhorse.rb
View file @
f432fb9a
...
@@ -52,7 +52,7 @@ module Gitlab
...
@@ -52,7 +52,7 @@ module Gitlab
end
end
def
send_git_blob
(
repository
,
blob
)
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
),
'GitalyServer'
=>
gitaly_server_hash
(
repository
),
'GetBlobRequest'
=>
{
'GetBlobRequest'
=>
{
...
@@ -80,7 +80,7 @@ module Gitlab
...
@@ -80,7 +80,7 @@ module Gitlab
params
=
repository
.
archive_metadata
(
ref
,
Gitlab
.
config
.
gitlab
.
repository_downloads_path
,
format
)
params
=
repository
.
archive_metadata
(
ref
,
Gitlab
.
config
.
gitlab
.
repository_downloads_path
,
format
)
raise
"Repository or ref not found"
if
params
.
empty?
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!
(
params
.
merge!
(
'GitalyServer'
=>
gitaly_server_hash
(
repository
),
'GitalyServer'
=>
gitaly_server_hash
(
repository
),
'GitalyRepository'
=>
repository
.
gitaly_repository
.
to_h
'GitalyRepository'
=>
repository
.
gitaly_repository
.
to_h
...
@@ -97,7 +97,7 @@ module Gitlab
...
@@ -97,7 +97,7 @@ module Gitlab
end
end
def
send_git_diff
(
repository
,
diff_refs
)
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
),
'GitalyServer'
=>
gitaly_server_hash
(
repository
),
'RawDiffRequest'
=>
Gitaly
::
RawDiffRequest
.
new
(
'RawDiffRequest'
=>
Gitaly
::
RawDiffRequest
.
new
(
...
@@ -115,7 +115,7 @@ module Gitlab
...
@@ -115,7 +115,7 @@ module Gitlab
end
end
def
send_git_patch
(
repository
,
diff_refs
)
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
),
'GitalyServer'
=>
gitaly_server_hash
(
repository
),
'RawPatchRequest'
=>
Gitaly
::
RawPatchRequest
.
new
(
'RawPatchRequest'
=>
Gitaly
::
RawPatchRequest
.
new
(
...
...
spec/lib/gitlab/workhorse_spec.rb
View file @
f432fb9a
...
@@ -55,7 +55,7 @@ describe Gitlab::Workhorse do
...
@@ -55,7 +55,7 @@ describe Gitlab::Workhorse do
end
end
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
it
'sets the header correctly'
do
key
,
command
,
params
=
decode_workhorse_header
(
subject
)
key
,
command
,
params
=
decode_workhorse_header
(
subject
)
...
@@ -100,7 +100,7 @@ describe Gitlab::Workhorse do
...
@@ -100,7 +100,7 @@ describe Gitlab::Workhorse do
end
end
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
it
'sets the header correctly'
do
key
,
command
,
params
=
decode_workhorse_header
(
subject
)
key
,
command
,
params
=
decode_workhorse_header
(
subject
)
...
@@ -173,7 +173,7 @@ describe Gitlab::Workhorse do
...
@@ -173,7 +173,7 @@ describe Gitlab::Workhorse do
end
end
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
it
'sets the header correctly'
do
key
,
command
,
params
=
decode_workhorse_header
(
subject
)
key
,
command
,
params
=
decode_workhorse_header
(
subject
)
...
@@ -455,7 +455,7 @@ describe Gitlab::Workhorse do
...
@@ -455,7 +455,7 @@ describe Gitlab::Workhorse do
end
end
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
it
'sets the header correctly'
do
key
,
command
,
params
=
decode_workhorse_header
(
subject
)
key
,
command
,
params
=
decode_workhorse_header
(
subject
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment