Skip to content
GitLab
菜单
为什么选择 GitLab
定价
联系销售
探索
为什么选择 GitLab
定价
联系销售
探索
登录
获取免费试用
主导航
搜索或转到…
项目
GitLab
管理
动态
成员
标记
计划
议题
议题看板
里程碑
迭代
需求
代码
合并请求
仓库
分支
提交
标签
仓库图
比较修订版本
代码片段
锁定的文件
构建
流水线
作业
流水线计划
测试用例
产物
部署
发布
Package registry
Container registry
模型注册表
运维
环境
Terraform 模块
监控
事件
服务台
分析
价值流分析
贡献者分析
CI/CD 分析
仓库分析
代码评审分析
议题分析
洞察
模型实验
效能分析
帮助
帮助
支持
GitLab 文档
比较 GitLab 各版本
社区论坛
为极狐GitLab 提交贡献
提交反馈
隐私声明
快捷键
?
新增功能
4
代码片段
群组
项目
显示更多面包屑
gitlab-cn
GitLab
提交
c76c514f
未验证
提交
c76c514f
编辑于
5 years ago
作者:
nmilojevic1
提交者:
Peter Leitzen
5 years ago
浏览文件
操作
下载
补丁
差异文件
Add retry mechanisam to after import
- use import_failure_service - add missing specs
上级
c785530c
Loading
Loading
加载中
变更
2
隐藏空白变更内容
行内
左右并排
显示
2 个更改的文件
app/services/projects/after_import_service.rb
+7
-1
7 个添加, 1 个删除
app/services/projects/after_import_service.rb
spec/services/projects/after_import_service_spec.rb
+48
-1
48 个添加, 1 个删除
spec/services/projects/after_import_service_spec.rb
有
55 个添加
和
2 个删除
app/services/projects/after_import_service.rb
+
7
−
1
浏览文件 @
c76c514f
...
@@ -12,7 +12,9 @@ def execute
...
@@ -12,7 +12,9 @@ def execute
service
=
Projects
::
HousekeepingService
.
new
(
@project
)
service
=
Projects
::
HousekeepingService
.
new
(
@project
)
service
.
execute
do
service
.
execute
do
repository
.
delete_all_refs_except
(
RESERVED_REF_PREFIXES
)
import_failure_service
.
with_retry
(
action:
'delete_all_refs'
)
do
repository
.
delete_all_refs_except
(
RESERVED_REF_PREFIXES
)
end
end
end
# Right now we don't actually have a way to know if a project
# Right now we don't actually have a way to know if a project
...
@@ -26,6 +28,10 @@ def execute
...
@@ -26,6 +28,10 @@ def execute
private
private
def
import_failure_service
@import_failure_service
||=
Gitlab
::
ImportExport
::
ImportFailureService
.
new
(
@project
)
end
def
repository
def
repository
@repository
||=
@project
.
repository
@repository
||=
@project
.
repository
end
end
...
...
此差异已折叠。
点击以展开。
spec/services/projects/after_import_service_spec.rb
+
48
−
1
浏览文件 @
c76c514f
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
allow
(
housekeeping_service
)
allow
(
housekeeping_service
)
.
to
receive
(
:execute
).
and_yield
.
to
receive
(
:execute
).
and_yield
expect
(
housekeeping_service
).
to
receive
(
:increment!
)
allow
(
housekeeping_service
).
to
receive
(
:increment!
)
end
end
it
'performs housekeeping'
do
it
'performs housekeeping'
do
...
@@ -58,6 +58,53 @@
...
@@ -58,6 +58,53 @@
end
end
end
end
context
'when after import action throw non-retriable exception'
do
let
(
:exception
)
{
StandardError
.
new
(
'after import error'
)
}
before
do
allow
(
repository
)
.
to
receive
(
:delete_all_refs_except
)
.
and_raise
(
exception
)
end
it
'throws after import error'
do
expect
{
subject
.
execute
}.
to
raise_exception
(
'after import error'
)
end
end
context
'when after import action throw retriable exception one time'
do
let
(
:exception
)
{
GRPC
::
DeadlineExceeded
.
new
}
before
do
repository
.
write_ref
(
'refs/pull/1/head'
,
sha
)
expect
(
repository
)
.
to
receive
(
:delete_all_refs_except
)
.
and_raise
(
exception
)
expect
(
repository
)
.
to
receive
(
:delete_all_refs_except
)
.
and_call_original
subject
.
execute
end
it
'removes refs/pull/**/*'
do
expect
(
rugged
.
references
.
map
(
&
:name
))
.
not_to
include
(
%r{
\A
refs/pull/}
)
end
it
'records the failures in the database'
,
:aggregate_failures
do
import_failure
=
ImportFailure
.
last
expect
(
import_failure
.
source
).
to
eq
(
'delete_all_refs'
)
expect
(
import_failure
.
project_id
).
to
eq
(
project
.
id
)
expect
(
import_failure
.
relation_key
).
to
be_nil
expect
(
import_failure
.
relation_index
).
to
be_nil
expect
(
import_failure
.
exception_class
).
to
eq
(
'GRPC::DeadlineExceeded'
)
expect
(
import_failure
.
exception_message
).
to
be_present
expect
(
import_failure
.
correlation_id_value
).
not_to
be_empty
end
end
def
rugged
def
rugged
rugged_repo
(
repository
)
rugged_repo
(
repository
)
end
end
...
...
此差异已折叠。
点击以展开。
预览
0%
加载中
请重试
或
添加新附件
.
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
保存评论
取消
想要评论请
注册
或
登录