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
d805cd36
Commit
d805cd36
authored
Jan 09, 2018
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add option to disable git archive caching in workhorse
parent
8de1bb9e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
1 deletion
+22
-1
GITLAB_WORKHORSE_VERSION
GITLAB_WORKHORSE_VERSION
+1
-1
lib/gitlab/workhorse.rb
lib/gitlab/workhorse.rb
+7
-0
spec/lib/gitlab/workhorse_spec.rb
spec/lib/gitlab/workhorse_spec.rb
+14
-0
No files found.
GITLAB_WORKHORSE_VERSION
View file @
d805cd36
3.
4
.0
3.
5
.0
lib/gitlab/workhorse.rb
View file @
d805cd36
...
@@ -97,6 +97,9 @@ module Gitlab
...
@@ -97,6 +97,9 @@ module Gitlab
)
)
end
end
# If present DisableCache must be a Boolean. Otherwise workhorse ignores it.
params
[
'DisableCache'
]
=
true
if
git_archive_cache_disabled?
[
[
SEND_DATA_HEADER
,
SEND_DATA_HEADER
,
"git-archive:
#{
encode
(
params
)
}
"
"git-archive:
#{
encode
(
params
)
}
"
...
@@ -244,6 +247,10 @@ module Gitlab
...
@@ -244,6 +247,10 @@ module Gitlab
right_commit_id:
diff_refs
.
head_sha
right_commit_id:
diff_refs
.
head_sha
}
}
end
end
def
git_archive_cache_disabled?
ENV
[
'WORKHORSE_ARCHIVE_CACHE_DISABLED'
].
present?
||
Feature
.
enabled?
(
:workhorse_archive_cache_disabled
)
end
end
end
end
end
end
end
spec/lib/gitlab/workhorse_spec.rb
View file @
d805cd36
...
@@ -26,11 +26,16 @@ describe Gitlab::Workhorse do
...
@@ -26,11 +26,16 @@ describe Gitlab::Workhorse do
'GitalyRepository'
=>
repository
.
gitaly_repository
.
to_h
.
deep_stringify_keys
'GitalyRepository'
=>
repository
.
gitaly_repository
.
to_h
.
deep_stringify_keys
)
)
end
end
let
(
:cache_disabled
)
{
false
}
subject
do
subject
do
described_class
.
send_git_archive
(
repository
,
ref:
ref
,
format:
format
)
described_class
.
send_git_archive
(
repository
,
ref:
ref
,
format:
format
)
end
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
context
'when Gitaly workhorse_archive feature is enabled'
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
)
...
@@ -39,6 +44,15 @@ describe Gitlab::Workhorse do
...
@@ -39,6 +44,15 @@ describe Gitlab::Workhorse do
expect
(
command
).
to
eq
(
'git-archive'
)
expect
(
command
).
to
eq
(
'git-archive'
)
expect
(
params
).
to
include
(
gitaly_params
)
expect
(
params
).
to
include
(
gitaly_params
)
end
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
end
context
'when Gitaly workhorse_archive feature is disabled'
,
:skip_gitaly_mock
do
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