Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
94495f98
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,发现更多精彩内容 >>
提交
94495f98
编写于
2月 14, 2017
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use new pipeline retry service with optimistic locking
上级
346a7c69
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
39 addition
and
27 deletion
+39
-27
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+3
-7
app/services/ci/retry_build_service.rb
app/services/ci/retry_build_service.rb
+2
-0
app/services/ci/retry_pipeline_service.rb
app/services/ci/retry_pipeline_service.rb
+34
-20
未找到文件。
app/models/ci/pipeline.rb
浏览文件 @
94495f98
...
...
@@ -224,13 +224,9 @@ module Ci
end
end
def
retry_failed
(
user
)
Gitlab
::
OptimisticLocking
.
retry_lock
(
builds
.
latest
.
failed_or_canceled
)
do
|
failed_or_canceled
|
failed_or_canceled
.
select
(
&
:retryable?
).
each
do
|
build
|
Ci
::
Build
.
retry
(
build
,
user
)
end
end
def
retry_failed
(
current_user
)
Ci
::
RetryPipelineService
.
new
(
project
,
current_user
)
.
execute
(
self
)
end
def
mark_as_processable_after_stage
(
stage_idx
)
...
...
app/services/ci/retry_build_service.rb
浏览文件 @
94495f98
module
Ci
class
RetryBuildService
<
::
BaseService
def
execute
(
build
)
# return unless build.retryable?
self
.
retry
(
build
).
tap
do
|
new_build
|
MergeRequests
::
AddTodoWhenBuildFailsService
.
new
(
build
.
project
,
current_user
)
...
...
app/services/ci/retry_pipeline_service.rb
浏览文件 @
94495f98
...
...
@@ -7,34 +7,48 @@ module Ci
raise
Gitlab
::
Access
::
AccessDeniedError
end
##
# Reprocess builds in subsequent stages
#
pipeline
.
builds
.
after_stage
(
resume_stage
.
index
)
.
failed_or_canceled
.
find_each
do
|
build
|
Ci
::
RetryBuildService
.
new
(
project
,
current_user
)
.
reprocess
(
build
)
end
##
# Mark skipped builds as processable again
#
pipeline
.
mark_as_processable_after_stage
(
resume_stage
.
index
)
##
# Retry builds in the first unsuccessful stage
#
resume_stage
.
builds
.
failed_or_canceled
.
find_each
do
|
build
|
Ci
::
RetryBuildService
.
new
(
project
,
current_user
)
retryable_builds_in_subsequent_stages
do
|
build
|
Ci
::
RetryBuildService
.
new
(
project
,
current_user
)
.
reprocess
(
build
)
end
retryable_builds_in_first_unsuccessful_stage
do
|
build
|
Ci
::
RetryBuildService
.
new
(
project
,
current_user
)
.
retry
(
build
)
end
end
private
def
retryable_builds_in_subsequent_stages
relation
=
@pipeline
.
builds
.
after_stage
(
resume_stage
.
index
)
.
failed_or_canceled
each_retryable_build_with_locking
(
relation
)
do
|
build
|
yield
build
end
end
def
retryable_builds_in_first_unsuccessful_stage
relation
=
resume_stage
.
builds
.
failed_or_canceled
each_retryable_build_with_locking
(
relation
)
do
|
build
|
yield
build
end
end
def
each_retryable_build_with_locking
(
relation
)
Gitlab
::
OptimisticLocking
.
retry_lock
(
relation
)
do
|
builds
|
builds
.
find_each
do
|
build
|
next
unless
build
.
retryable?
yield
build
end
end
end
def
resume_stage
@resume_stage
||=
@pipeline
.
stages
.
find
do
|
stage
|
stage
.
failed?
||
stage
.
canceled?
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录