Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a6c52c4e
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 搜索 >>
提交
a6c52c4e
编写于
10月 27, 2017
作者:
O
Oswaldo Ferreira
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make merge_jid handling less stateful in MergeService
上级
dfd6c3f8
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
18 addition
and
61 deletion
+18
-61
app/models/merge_request.rb
app/models/merge_request.rb
+3
-1
app/services/merge_requests/merge_service.rb
app/services/merge_requests/merge_service.rb
+1
-8
app/workers/stuck_merge_jobs_worker.rb
app/workers/stuck_merge_jobs_worker.rb
+1
-1
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+6
-0
spec/services/merge_requests/merge_service_spec.rb
spec/services/merge_requests/merge_service_spec.rb
+0
-49
spec/workers/stuck_merge_jobs_worker_spec.rb
spec/workers/stuck_merge_jobs_worker_spec.rb
+7
-2
未找到文件。
app/models/merge_request.rb
浏览文件 @
a6c52c4e
...
...
@@ -396,7 +396,9 @@ class MergeRequest < ActiveRecord::Base
end
def
merge_ongoing?
!!
merge_jid
&&
!
merged?
&&
Gitlab
::
SidekiqStatus
.
running?
(
merge_jid
)
# While the MergeRequest is locked, it should present itself as 'merge ongoing'.
# The unlocking process is handled by StuckMergeJobsWorker scheduled in Cron.
locked?
||
!!
merge_jid
&&
!
merged?
&&
Gitlab
::
SidekiqStatus
.
running?
(
merge_jid
)
end
def
closed_without_fork?
...
...
app/services/merge_requests/merge_service.rb
浏览文件 @
a6c52c4e
...
...
@@ -82,16 +82,9 @@ module MergeRequests
@merge_request
.
can_remove_source_branch?
(
branch_deletion_user
)
end
# Logs merge error message and cleans `MergeRequest#merge_jid`.
#
def
handle_merge_error
(
log_message
:,
save_message_on_model:
false
)
Rails
.
logger
.
error
(
"MergeService ERROR:
#{
merge_request_info
}
-
#{
log_message
}
"
)
if
save_message_on_model
@merge_request
.
update
(
merge_error:
log_message
,
merge_jid:
nil
)
else
clean_merge_jid
end
@merge_request
.
update
(
merge_error:
log_message
)
if
save_message_on_model
end
def
merge_request_info
...
...
app/workers/stuck_merge_jobs_worker.rb
浏览文件 @
a6c52c4e
...
...
@@ -23,7 +23,7 @@ class StuckMergeJobsWorker
merge_requests
=
MergeRequest
.
where
(
id:
completed_ids
)
merge_requests
.
where
.
not
(
merge_commit_sha:
nil
).
update_all
(
state: :merged
)
merge_requests
.
where
(
merge_commit_sha:
nil
).
update_all
(
state: :opened
)
merge_requests
.
where
(
merge_commit_sha:
nil
).
update_all
(
state: :opened
,
merge_jid:
nil
)
Rails
.
logger
.
info
(
"Updated state of locked merge jobs. JIDs:
#{
completed_jids
.
join
(
', '
)
}
"
)
end
...
...
spec/models/merge_request_spec.rb
浏览文件 @
a6c52c4e
...
...
@@ -1460,6 +1460,12 @@ describe MergeRequest do
end
describe
'#merge_ongoing?'
do
it
'returns true when the merge request is locked'
do
merge_request
=
build_stubbed
(
:merge_request
,
state: :locked
)
expect
(
merge_request
.
merge_ongoing?
).
to
be
(
true
)
end
it
'returns true when merge_id, MR is not merged and it has no running job'
do
merge_request
=
build_stubbed
(
:merge_request
,
state: :open
,
merge_jid:
'foo'
)
allow
(
Gitlab
::
SidekiqStatus
).
to
receive
(
:running?
).
with
(
'foo'
)
{
true
}
...
...
spec/services/merge_requests/merge_service_spec.rb
浏览文件 @
a6c52c4e
...
...
@@ -12,55 +12,6 @@ describe MergeRequests::MergeService do
end
describe
'#execute'
do
context
'MergeRequest#merge_jid'
do
let
(
:service
)
do
described_class
.
new
(
project
,
user
,
commit_message:
'Awesome message'
)
end
before
do
merge_request
.
update_column
(
:merge_jid
,
'hash-123'
)
end
it
'is cleaned when no error is raised'
do
service
.
execute
(
merge_request
)
expect
(
merge_request
.
reload
.
merge_jid
).
to
be_nil
end
it
'is cleaned when expected error is raised'
do
allow
(
service
).
to
receive
(
:commit
).
and_raise
(
described_class
::
MergeError
)
service
.
execute
(
merge_request
)
expect
(
merge_request
.
reload
.
merge_jid
).
to
be_nil
end
it
'is cleaned when merge request is not mergeable'
do
allow
(
merge_request
).
to
receive
(
:mergeable?
).
and_return
(
false
)
service
.
execute
(
merge_request
)
expect
(
merge_request
.
reload
.
merge_jid
).
to
be_nil
end
it
'is cleaned when no source is found'
do
allow
(
merge_request
).
to
receive
(
:diff_head_sha
).
and_return
(
nil
)
service
.
execute
(
merge_request
)
expect
(
merge_request
.
reload
.
merge_jid
).
to
be_nil
end
it
'is not cleaned when unexpected error is raised'
do
service
=
described_class
.
new
(
project
,
user
,
commit_message:
'Awesome message'
)
allow
(
service
).
to
receive
(
:commit
).
and_raise
(
StandardError
)
expect
{
service
.
execute
(
merge_request
)
}.
to
raise_error
(
StandardError
)
expect
(
merge_request
.
reload
.
merge_jid
).
to
be_present
end
end
context
'valid params'
do
let
(
:service
)
{
described_class
.
new
(
project
,
user
,
commit_message:
'Awesome message'
)
}
...
...
spec/workers/stuck_merge_jobs_worker_spec.rb
浏览文件 @
a6c52c4e
...
...
@@ -12,8 +12,13 @@ describe StuckMergeJobsWorker do
worker
.
perform
expect
(
mr_with_sha
.
reload
).
to
be_merged
expect
(
mr_without_sha
.
reload
).
to
be_opened
mr_with_sha
.
reload
mr_without_sha
.
reload
expect
(
mr_with_sha
).
to
be_merged
expect
(
mr_without_sha
).
to
be_opened
expect
(
mr_with_sha
.
merge_jid
).
to
be_present
expect
(
mr_without_sha
.
merge_jid
).
to
be_nil
end
it
'updates merge request to opened when locked but has not been merged'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录