Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d805cd36
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d805cd36
编写于
1月 09, 2018
作者:
J
Jacob Vosmaer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add option to disable git archive caching in workhorse
上级
8de1bb9e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
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
未找到文件。
GITLAB_WORKHORSE_VERSION
浏览文件 @
d805cd36
3.
4
.0
3.
5
.0
lib/gitlab/workhorse.rb
浏览文件 @
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
浏览文件 @
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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录