Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
ebd1933e565a
Commit
f808b092
authored
Jan 09, 2018
by
Jacob Vosmaer
Browse files
Add option to disable git archive caching in workhorse
parent
de8396f5df19
Changes
3
Hide whitespace changes
Inline
Side-by-side
GITLAB_WORKHORSE_VERSION
View file @
ebd1933e
3.
4
.0
3.
5
.0
lib/gitlab/workhorse.rb
View file @
ebd1933e
...
...
@@ -97,6 +97,9 @@ def send_git_archive(repository, ref:, format:)
)
end
# If present DisableCache must be a Boolean. Otherwise workhorse ignores it.
params
[
'DisableCache'
]
=
true
if
git_archive_cache_disabled?
[
SEND_DATA_HEADER
,
"git-archive:
#{
encode
(
params
)
}
"
...
...
@@ -244,6 +247,10 @@ def gitaly_diff_or_patch_hash(repository, diff_refs)
right_commit_id:
diff_refs
.
head_sha
}
end
def
git_archive_cache_disabled?
ENV
[
'WORKHORSE_ARCHIVE_CACHE_DISABLED'
].
present?
||
Feature
.
enabled?
(
:workhorse_archive_cache_disabled
)
end
end
end
end
spec/lib/gitlab/workhorse_spec.rb
View file @
ebd1933e
...
...
@@ -26,11 +26,16 @@ def decode_workhorse_header(array)
'GitalyRepository'
=>
repository
.
gitaly_repository
.
to_h
.
deep_stringify_keys
)
end
let
(
:cache_disabled
)
{
false
}
subject
do
described_class
.
send_git_archive
(
repository
,
ref:
ref
,
format:
format
)
end
before
do
allow
(
described_class
).
to
receive
(
:git_archive_cache_disabled?
).
and_return
(
cache_disabled
)
end
context
'when Gitaly workhorse_archive feature is enabled'
do
it
'sets the header correctly'
do
key
,
command
,
params
=
decode_workhorse_header
(
subject
)
...
...
@@ -39,6 +44,15 @@ def decode_workhorse_header(array)
expect
(
command
).
to
eq
(
'git-archive'
)
expect
(
params
).
to
include
(
gitaly_params
)
end
context
'when archive caching is disabled'
do
let
(
:cache_disabled
)
{
true
}
it
'tells workhorse not to use the cache'
do
_
,
_
,
params
=
decode_workhorse_header
(
subject
)
expect
(
params
).
to
include
({
'DisableCache'
=>
true
})
end
end
end
context
'when Gitaly workhorse_archive feature is disabled'
,
:skip_gitaly_mock
do
...
...
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