Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
70d015d1
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,发现更多精彩内容 >>
提交
70d015d1
编写于
10月 01, 2018
作者:
S
Shinya Maeda
提交者:
Alessio Caiazza
10月 02, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cleanup drop_stale_scheduled_builds code
上级
a220e72c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
29 addition
and
2 deletion
+29
-2
app/workers/stuck_ci_jobs_worker.rb
app/workers/stuck_ci_jobs_worker.rb
+7
-2
scheduled_job_fixture.rb
scheduled_job_fixture.rb
+22
-0
未找到文件。
app/workers/stuck_ci_jobs_worker.rb
浏览文件 @
70d015d1
...
...
@@ -10,6 +10,7 @@ class StuckCiJobsWorker
BUILD_PENDING_OUTDATED_TIMEOUT
=
1
.
day
BUILD_SCHEDULED_OUTDATED_TIMEOUT
=
1
.
hour
BUILD_PENDING_STUCK_TIMEOUT
=
1
.
hour
BUILD_SCHEDULED_OUTDATED_BATCH_SIZE
=
100
def
perform
return
unless
try_obtain_lease
...
...
@@ -68,8 +69,12 @@ class StuckCiJobsWorker
# `ci_builds` table has a partial index on `id` with `scheduled_at <> NULL` condition.
# Therefore this query's first step uses Index Search, and the following expensive
# filter `scheduled_at < ?` will only perform on a small subset (max: 100 rows)
Ci
::
Build
.
include
(
EachBatch
).
where
(
'scheduled_at IS NOT NULL'
).
each_batch
(
of:
100
)
do
|
relation
|
relation
.
where
(
'scheduled_at < ?'
,
BUILD_SCHEDULED_OUTDATED_TIMEOUT
.
ago
).
find_each
do
|
build
|
Ci
::
Build
.
include
(
EachBatch
)
.
where
(
'scheduled_at IS NOT NULL'
)
.
each_batch
(
of:
BUILD_SCHEDULED_OUTDATED_BATCH_SIZE
)
do
|
relation
|
relation
.
where
(
'scheduled_at < ?'
,
BUILD_SCHEDULED_OUTDATED_TIMEOUT
.
ago
)
.
find_each
(
batch_size:
BUILD_SCHEDULED_OUTDATED_BATCH_SIZE
)
do
|
build
|
drop_build
(
:outdated
,
build
,
:scheduled
,
BUILD_SCHEDULED_OUTDATED_TIMEOUT
,
:schedule_expired
)
end
end
...
...
scheduled_job_fixture.rb
浏览文件 @
70d015d1
...
...
@@ -189,4 +189,26 @@ class ScheduledJobFixture
def
cancel_pipeline
Ci
::
Pipeline
.
last
.
cancel_running
end
def
create_stale_scheduled_builds
count
=
100
rows
=
[]
last_pipeline
=
Ci
::
Pipeline
.
last
last_stage
=
last_pipeline
.
stages
.
last
count
.
times
do
|
i
|
rows
<<
{
name:
"delayed-job-bulk-
#{
i
}
"
,
project_id:
project
.
id
,
commit_id:
last_pipeline
.
id
,
status:
'scheduled'
,
scheduled_at:
1
.
day
.
ago
,
user_id:
user
.
id
,
stage_id:
last_stage
.
id
,
type:
'Ci::Build'
}
end
Gitlab
::
Database
.
bulk_insert
(
'ci_builds'
,
rows
)
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录