Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
137541c0
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,发现更多精彩内容 >>
提交
137541c0
编写于
11月 29, 2018
作者:
S
Shinya Maeda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve comments
上级
af5bf568
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
2 deletion
+27
-2
app/services/ci/archive_trace_service.rb
app/services/ci/archive_trace_service.rb
+12
-2
spec/workers/ci/archive_traces_cron_worker_spec.rb
spec/workers/ci/archive_traces_cron_worker_spec.rb
+15
-0
未找到文件。
app/services/ci/archive_trace_service.rb
浏览文件 @
137541c0
...
...
@@ -7,19 +7,29 @@ module Ci
rescue
::
Gitlab
::
Ci
::
Trace
::
AlreadyArchivedError
# It's already archived, thus we can safely ignore this exception.
rescue
=>
e
# Tracks this error with application logs, Sentry, and Prometheus.
# If `archive!` keeps failing for over a week, that could incur data loss.
# (See more https://docs.gitlab.com/ee/administration/job_traces.html#new-live-trace-architecture)
# In order to avoid interrupting the system, we do not raise an exception here.
archive_error
(
e
,
job
)
end
private
def
failed_archive_counter
@failed_archive_counter
||=
Gitlab
::
Metrics
.
counter
(
:job_trace_archive_failed_total
,
"Counter of failed attempts of trace archiving"
)
@failed_archive_counter
||=
Gitlab
::
Metrics
.
counter
(
:job_trace_archive_failed_total
,
"Counter of failed attempts of trace archiving"
)
end
def
archive_error
(
error
,
job
)
failed_archive_counter
.
increment
Gitlab
::
Sentry
.
track_exception
(
error
,
issue_url:
'https://gitlab.com/gitlab-org/gitlab-ce/issues/51502'
,
extra:
{
job_id:
job
.
id
})
Rails
.
logger
.
error
"Failed to archive trace. id:
#{
job
.
id
}
message:
#{
error
.
message
}
"
Gitlab
::
Sentry
.
track_exception
(
error
,
issue_url:
'https://gitlab.com/gitlab-org/gitlab-ce/issues/51502'
,
extra:
{
job_id:
job
.
id
})
end
end
end
spec/workers/ci/archive_traces_cron_worker_spec.rb
浏览文件 @
137541c0
...
...
@@ -48,6 +48,21 @@ describe Ci::ArchiveTracesCronWorker do
expect
(
build2
.
job_artifacts_trace
).
to
be_exist
end
end
context
'when an unexpected exception happened during archiving'
do
let!
(
:build
)
{
create
(
:ci_build
,
:success
,
:trace_live
)
}
before
do
allow
(
Gitlab
::
Sentry
).
to
receive
(
:track_exception
)
allow_any_instance_of
(
Gitlab
::
Ci
::
Trace
).
to
receive
(
:archive!
).
and_raise
(
'Unexpected error'
)
end
it
'puts a log'
do
expect
(
Rails
.
logger
).
to
receive
(
:error
).
with
(
"Failed to archive trace. id:
#{
build
.
id
}
message: Unexpected error"
)
subject
end
end
end
context
'when a job was cancelled'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录