Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3494cdfe
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,体验更适合开发者的 AI 搜索 >>
提交
3494cdfe
编写于
12月 12, 2017
作者:
S
Shinya Maeda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build
上级
8d739237
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
8 deletion
+22
-8
app/services/ci/register_job_service.rb
app/services/ci/register_job_service.rb
+9
-8
spec/services/ci/register_job_service_spec.rb
spec/services/ci/register_job_service_spec.rb
+13
-0
未找到文件。
app/services/ci/register_job_service.rb
浏览文件 @
3494cdfe
...
...
@@ -38,11 +38,15 @@ module Ci
begin
# In case when 2 runners try to assign the same build, second runner will be declined
# with StateMachines::InvalidTransition or StaleObjectError when doing run! or save method.
build
.
runner_id
=
runner
.
id
build
.
run!
register_success
(
build
)
return
Result
.
new
(
build
,
true
)
begin
build
.
runner_id
=
runner
.
id
build
.
run!
register_success
(
build
)
return
Result
.
new
(
build
,
true
)
rescue
Ci
::
Build
::
MissingDependenciesError
build
.
drop!
(
:missing_dependency_failure
)
end
rescue
StateMachines
::
InvalidTransition
,
ActiveRecord
::
StaleObjectError
# We are looping to find another build that is not conflicting
# It also indicates that this build can be picked and passed to runner.
...
...
@@ -54,9 +58,6 @@ module Ci
# we still have to return 409 in the end,
# to make sure that this is properly handled by runner.
valid
=
false
rescue
Ci
::
Build
::
MissingDependenciesError
build
.
drop!
(
:missing_dependency_failure
)
valid
=
false
end
end
...
...
spec/services/ci/register_job_service_spec.rb
浏览文件 @
3494cdfe
...
...
@@ -307,6 +307,19 @@ module Ci
it_behaves_like
'not pick'
end
context
'when job object is staled'
do
let!
(
:pre_stage_job
)
{
create
(
:ci_build
,
:running
,
pipeline:
pipeline
,
name:
'test'
,
stage_idx:
0
)
}
before
do
allow_any_instance_of
(
Ci
::
Build
).
to
receive
(
:drop!
)
.
and_raise
(
ActiveRecord
::
StaleObjectError
.
new
(
pending_job
,
:drop!
))
end
it
'does not drop nor pick'
do
expect
(
subject
).
to
be_nil
end
end
end
shared_examples
'validation is not active'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录