Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3d42bab7
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,发现更多精彩内容 >>
未验证
提交
3d42bab7
编写于
6月 12, 2018
作者:
M
Micaël Bergeron
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
apply feedback
上级
e1589a5c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
21 deletion
+16
-21
app/uploaders/object_storage.rb
app/uploaders/object_storage.rb
+2
-1
spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb
...ers/workers/object_storage/migrate_uploads_worker_spec.rb
+14
-20
未找到文件。
app/uploaders/object_storage.rb
浏览文件 @
3d42bab7
...
...
@@ -16,7 +16,8 @@ module ObjectStorage
end
def
message
"Exclusive lease
#{
@lease_key
}
already taken."
*
lease_key_group
,
_
=
*
@lease_key
.
split
(
":"
)
"Exclusive lease for
#{
lease_key_group
.
join
(
':'
)
}
is already taken."
end
end
...
...
spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb
浏览文件 @
3d42bab7
require
'spec_helper'
MIGRATION_QUERIES
=
5
describe
ObjectStorage
::
MigrateUploadsWorker
,
:sidekiq
do
shared_context
'sanity_check! fails'
do
before
do
...
...
@@ -127,13 +125,12 @@ describe ObjectStorage::MigrateUploadsWorker, :sidekiq do
it_behaves_like
"uploads migration worker"
describe
"limits N+1 queries"
do
let!
(
:projects
)
{
create_list
(
:project
,
10
,
:with_avatar
)
}
it
"to N*
#{
MIGRATION_QUERIES
}
"
do
it
"to N*5"
do
query_count
=
ActiveRecord
::
QueryRecorder
.
new
{
perform
(
uploads
)
}
more_projects
=
create_list
(
:project
,
100
,
:with_avatar
)
expected_queries_per_migration
=
MIGRATION_QUERIES
*
more_projects
.
count
more_projects
=
create_list
(
:project
,
3
,
:with_avatar
)
expected_queries_per_migration
=
5
*
more_projects
.
count
expect
{
perform
(
Upload
.
all
)
}.
not_to
exceed_query_limit
(
query_count
).
with_threshold
(
expected_queries_per_migration
)
end
end
...
...
@@ -144,30 +141,27 @@ describe ObjectStorage::MigrateUploadsWorker, :sidekiq do
let
(
:secret
)
{
SecureRandom
.
hex
}
let
(
:mounted_as
)
{
nil
}
def
upload_file
(
project
)
uploader
=
FileUploader
.
new
(
project
)
uploader
.
store!
(
fixture_file_upload
(
'spec/fixtures/doc_sample.txt'
))
end
before
do
stub_uploads_object_storage
(
FileUploader
)
projects
.
map
do
|
project
|
uploader
=
FileUploader
.
new
(
project
)
uploader
.
store!
(
fixture_file_upload
(
'spec/fixtures/doc_sample.txt'
))
end
projects
.
map
(
&
method
(
:upload_file
))
end
it_behaves_like
"uploads migration worker"
describe
"limits N+1 queries"
do
let!
(
:projects
)
{
create_list
(
:project
,
10
)
}
it
"to N*
#{
MIGRATION_QUERIES
}
"
do
it
"to N*5"
do
query_count
=
ActiveRecord
::
QueryRecorder
.
new
{
perform
(
uploads
)
}
more_projects
=
create_list
(
:project
,
100
)
more_projects
.
map
do
|
project
|
uploader
=
FileUploader
.
new
(
project
)
uploader
.
store!
(
fixture_file_upload
(
'spec/fixtures/doc_sample.txt'
))
end
expected_queries_per_migration
=
MIGRATION_QUERIES
*
more_projects
.
count
more_projects
=
create_list
(
:project
,
3
)
more_projects
.
map
(
&
method
(
:upload_file
))
expected_queries_per_migration
=
5
*
more_projects
.
count
expect
{
perform
(
Upload
.
all
)
}.
not_to
exceed_query_limit
(
query_count
).
with_threshold
(
expected_queries_per_migration
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录