Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8d1cdc94
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,发现更多精彩内容 >>
未验证
提交
8d1cdc94
编写于
2月 07, 2017
作者:
T
Tomasz Maczukin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update stuck and outdated builds cleanup worker
上级
e5bafed8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
101 addition
and
35 deletion
+101
-35
app/workers/stuck_ci_builds_worker.rb
app/workers/stuck_ci_builds_worker.rb
+31
-7
spec/workers/stuck_ci_builds_worker_spec.rb
spec/workers/stuck_ci_builds_worker_spec.rb
+70
-28
未找到文件。
app/workers/stuck_ci_builds_worker.rb
浏览文件 @
8d1cdc94
...
...
@@ -2,18 +2,42 @@ class StuckCiBuildsWorker
include
Sidekiq
::
Worker
include
CronjobQueue
BUILD_STUCK_TIMEOUT
=
1
.
day
BUILD_RUNNING_OUTDATED_TIMEOUT
=
1
.
hour
BUILD_PENDING_OUTDATED_TIMEOUT
=
1
.
day
BUILD_PENDING_STUCK_TIMEOUT
=
1
.
hour
def
perform
Rails
.
logger
.
info
'Cleaning stuck builds'
builds
=
Ci
::
Build
.
joins
(
:project
).
running_or_pending
.
where
(
'ci_builds.updated_at < ?'
,
BUILD_STUCK_TIMEOUT
.
ago
)
builds
.
find_each
(
batch_size:
50
).
each
do
|
build
|
Rails
.
logger
.
debug
"Dropping stuck
#{
build
.
status
}
build
#{
build
.
id
}
for runner
#{
build
.
runner_id
}
"
build
.
drop
drop
:running
,
BUILD_RUNNING_OUTDATED_TIMEOUT
drop
:pending
,
BUILD_PENDING_OUTDATED_TIMEOUT
drop_stuck
:pending
,
BUILD_PENDING_STUCK_TIMEOUT
end
private
def
drop
(
status
,
timeout
)
search
(
status
,
timeout
)
do
|
build
|
drop_build
:outdated
,
build
,
status
,
timeout
end
end
def
drop_stuck
(
status
,
timeout
)
search
(
status
,
timeout
)
do
|
build
|
return
unless
build
.
stuck?
drop_build
:stuck
,
build
,
status
,
timeout
end
end
def
search
(
status
,
timeout
)
builds
=
Ci
::
Build
.
where
(
status:
status
).
where
(
'ci_builds.updated_at < ?'
,
timeout
.
ago
)
builds
.
joins
(
:project
).
find_each
(
batch_size:
50
).
each
do
|
build
|
yield
(
build
)
end
end
# Update builds that failed to drop
builds
.
update_all
(
status:
'failed'
)
def
drop_build
(
type
,
build
,
status
,
timeout
)
Rails
.
logger
.
info
"
#{
self
.
class
}
: Dropping
#{
type
.
to_s
}
build
#{
build
.
id
}
for runner
#{
build
.
runner_id
}
(status:
#{
status
}
, timeout:
#{
timeout
}
)"
build
.
drop
end
end
spec/workers/stuck_ci_builds_worker_spec.rb
浏览文件 @
8d1cdc94
require
"spec_helper"
require
'spec_helper'
describe
StuckCiBuildsWorker
do
let!
(
:build
)
{
create
:ci_build
}
let!
(
:runner
)
{
create
:ci_runner
}
let!
(
:build
)
{
create
:ci_build
,
runner:
runner
}
let
(
:worker
)
{
described_class
.
new
}
subject
do
...
...
@@ -9,47 +10,88 @@ describe StuckCiBuildsWorker do
build
.
status
end
%w(pending running)
.
each
do
|
status
|
context
"
#{
status
}
build"
do
before
do
build
.
update!
(
status:
status
)
before
{
build
.
update!
(
status:
status
,
updated_at:
updated_at
)
}
shared_examples
'build is dropped'
do
it
'changes status'
do
worker
.
perform
is_expected
.
to
eq
(
'failed'
)
end
end
shared_examples
'build is unchanged'
do
it
"doesn't change status"
do
worker
.
perform
is_expected
.
to
eq
(
status
)
end
end
context
'when build is pending'
do
let
(
:status
)
{
'pending'
}
context
'when build is not stuck'
do
before
{
allow_any_instance_of
(
Ci
::
Build
).
to
receive
(
:stuck?
).
and_return
(
false
)
}
context
'when build was not updated for more than 1 day ago'
do
let
(
:updated_at
)
{
2
.
days
.
ago
}
it_behaves_like
'build is dropped'
end
it
'gets dropped if it was updated over 2 days ago'
do
build
.
update!
(
updated_at:
2
.
days
.
ago
)
worker
.
perform
is_expected
.
to
eq
(
'failed'
)
context
'when build was updated in less than 1 day ago'
do
let
(
:updated_at
)
{
6
.
hours
.
ago
}
it_behaves_like
'build is unchanged'
end
it
"is still
#{
status
}
"
do
build
.
update!
(
updated_at:
1
.
minute
.
ago
)
worker
.
perform
is_expected
.
to
eq
(
status
)
context
'when build was not updated for more than 1 hour ago'
do
let
(
:updated_at
)
{
2
.
hours
.
ago
}
it_behaves_like
'build is unchanged'
end
end
end
%w(success failed canceled)
.
each
do
|
status
|
context
"
#{
status
}
build"
do
before
do
build
.
update!
(
status:
status
)
context
'when build is stuck'
do
before
{
allow_any_instance_of
(
Ci
::
Build
).
to
receive
(
:stuck?
).
and_return
(
true
)
}
context
'when build was not updated for more than 1 hour ago'
do
let
(
:updated_at
)
{
2
.
hours
.
ago
}
it_behaves_like
'build is dropped'
end
it
"is still
#{
status
}
"
do
build
.
update!
(
updated_at:
2
.
days
.
ago
)
worker
.
perform
is_expected
.
to
eq
(
status
)
context
'when build was updated in less than 1 hour ago'
do
let
(
:updated_at
)
{
30
.
minutes
.
ago
}
it_behaves_like
'build is unchanged'
end
end
end
context
"for deleted project"
do
before
do
build
.
update!
(
status: :running
,
updated_at:
2
.
days
.
ago
)
build
.
project
.
update
(
pending_delete:
true
)
context
'when build is running'
do
let
(
:status
)
{
'running'
}
context
'when build was not updated for more than 1 hour ago'
do
let
(
:updated_at
)
{
2
.
hours
.
ago
}
it_behaves_like
'build is dropped'
end
it
"does not drop build"
do
context
'when build was updated in less than 1 hour ago'
do
let
(
:updated_at
)
{
30
.
minutes
.
ago
}
it_behaves_like
'build is unchanged'
end
end
%w(success skipped failed canceled)
.
each
do
|
status
|
context
"when build is
#{
status
}
"
do
let
(
:status
)
{
status
}
let
(
:updated_at
)
{
2
.
days
.
ago
}
it_behaves_like
'build is unchanged'
end
end
context
'for deleted project'
do
let
(
:status
)
{
'running'
}
let
(
:updated_at
)
{
2
.
days
.
ago
}
before
{
build
.
project
.
update
(
pending_delete:
true
)
}
it
'does not drop build'
do
expect_any_instance_of
(
Ci
::
Build
).
not_to
receive
(
:drop
)
worker
.
perform
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录