Skip to content
GitLab
菜单
为什么选择 GitLab
定价
联系销售
探索
为什么选择 GitLab
定价
联系销售
探索
登录
获取免费试用
主导航
搜索或转到…
项目
GitLab
管理
动态
成员
标记
计划
议题
议题看板
里程碑
迭代
需求
代码
合并请求
仓库
分支
提交
标签
仓库图
比较修订版本
代码片段
锁定的文件
构建
流水线
作业
流水线计划
测试用例
产物
部署
发布
Package registry
容器镜像库
模型注册表
运维
环境
Terraform 模块
监控
事件
服务台
分析
价值流分析
贡献者分析
CI/CD 分析
仓库分析
代码评审分析
议题分析
洞察
模型实验
效能分析
帮助
帮助
支持
GitLab 文档
比较 GitLab 各版本
社区论坛
为极狐GitLab 提交贡献
提交反馈
隐私声明
快捷键
?
新增功能
4
代码片段
群组
项目
显示更多面包屑
gitlab-cn
GitLab
提交
9255d68a
未验证
提交
9255d68a
编辑于
4 months ago
作者:
Terri Chu
提交者:
GitLab
4 months ago
浏览文件
操作
下载
补丁
差异文件
Do not delay indexing for dev envs
上级
12592f7e
Loading
Loading
无相关合并请求
变更
2
隐藏空白变更内容
行内
左右并排
显示
2 个更改的文件
ee/app/workers/search/elastic/trigger_indexing_worker.rb
+11
-3
11 个添加, 3 个删除
ee/app/workers/search/elastic/trigger_indexing_worker.rb
ee/spec/workers/search/elastic/trigger_indexing_worker_spec.rb
+34
-2
34 个添加, 2 个删除
...ec/workers/search/elastic/trigger_indexing_worker_spec.rb
有
45 个添加
和
5 个删除
ee/app/workers/search/elastic/trigger_indexing_worker.rb
+
11
−
3
浏览文件 @
9255d68a
...
@@ -9,6 +9,7 @@ class TriggerIndexingWorker
...
@@ -9,6 +9,7 @@ class TriggerIndexingWorker
INITIAL_TASK
=
:initiate
INITIAL_TASK
=
:initiate
TASKS
=
%i[namespaces projects snippets users]
.
freeze
TASKS
=
%i[namespaces projects snippets users]
.
freeze
DEFAULT_DELAY
=
2
.
minutes
data_consistency
:delayed
data_consistency
:delayed
...
@@ -55,15 +56,14 @@ def initiate
...
@@ -55,15 +56,14 @@ def initiate
).
execute
).
execute
logger
.
info
(
'Setting `elasticsearch_indexing` has been enabled.'
)
logger
.
info
(
'Setting `elasticsearch_indexing` has been enabled.'
)
self
.
class
.
perform_in
(
2
.
minutes
,
INITIAL_TASK
,
options
)
reenqueue_initial_task
return
false
return
false
end
end
unless
::
Gitlab
::
CurrentSettings
.
elasticsearch_pause_indexing?
unless
::
Gitlab
::
CurrentSettings
.
elasticsearch_pause_indexing?
task_executor_service
.
execute
(
:pause_indexing
)
task_executor_service
.
execute
(
:pause_indexing
)
reenqueue_initial_task
self
.
class
.
perform_in
(
2
.
minutes
,
INITIAL_TASK
,
options
)
return
false
return
false
end
end
...
@@ -87,6 +87,14 @@ def task_executor_service
...
@@ -87,6 +87,14 @@ def task_executor_service
def
logger
def
logger
@logger
||=
::
Gitlab
::
Elasticsearch
::
Logger
.
build
@logger
||=
::
Gitlab
::
Elasticsearch
::
Logger
.
build
end
end
def
reenqueue_initial_task
if
Rails
.
env
.
development?
self
.
class
.
perform_async
(
INITIAL_TASK
,
options
)
else
self
.
class
.
perform_in
(
DEFAULT_DELAY
,
INITIAL_TASK
,
options
)
end
end
end
end
end
end
end
end
此差异已折叠。
点击以展开。
ee/spec/workers/search/elastic/trigger_indexing_worker_spec.rb
+
34
−
2
浏览文件 @
9255d68a
...
@@ -88,10 +88,24 @@
...
@@ -88,10 +88,24 @@
it
'pauses indexing and reschedules itself'
do
it
'pauses indexing and reschedules itself'
do
expect
(
task_executor_service
).
to
receive
(
:execute
).
with
(
:pause_indexing
)
expect
(
task_executor_service
).
to
receive
(
:execute
).
with
(
:pause_indexing
)
expect
(
described_class
).
to
receive
(
:perform_in
).
with
(
2
.
minutes
,
described_class
::
INITIAL_TASK
,
{})
expect
(
described_class
).
to
receive
(
:perform_in
)
.
with
(
described_class
::
DEFAULT_DELAY
,
described_class
::
INITIAL_TASK
,
{})
expect
(
perform
).
to
be
false
expect
(
perform
).
to
be
false
end
end
context
'when in development environment'
do
before
do
stub_rails_env
(
'development'
)
end
it
'pauses indexing and runs itself without delay'
do
expect
(
task_executor_service
).
to
receive
(
:execute
).
with
(
:pause_indexing
)
expect
(
described_class
).
to
receive
(
:perform_async
).
with
(
described_class
::
INITIAL_TASK
,
{})
expect
(
perform
).
to
be
false
end
end
end
end
context
'when indexing is disabled'
do
context
'when indexing is disabled'
do
...
@@ -105,10 +119,28 @@
...
@@ -105,10 +119,28 @@
nil
,
nil
,
{
elasticsearch_indexing:
true
}).
and_call_original
{
elasticsearch_indexing:
true
}).
and_call_original
expect
(
task_executor_service
).
not_to
receive
(
:execute
)
expect
(
task_executor_service
).
not_to
receive
(
:execute
)
expect
(
described_class
).
to
receive
(
:perform_in
).
with
(
2
.
minutes
,
described_class
::
INITIAL_TASK
,
{})
expect
(
described_class
).
to
receive
(
:perform_in
)
.
with
(
described_class
::
DEFAULT_DELAY
,
described_class
::
INITIAL_TASK
,
{})
expect
(
perform
).
to
be
false
expect
(
perform
).
to
be
false
end
end
context
'when in development environment'
do
before
do
stub_rails_env
(
'development'
)
end
it
'enables indexing and runs itself without delay'
do
expect
(
ApplicationSettings
::
UpdateService
).
to
receive
(
:new
).
with
(
Gitlab
::
CurrentSettings
.
current_application_settings
,
nil
,
{
elasticsearch_indexing:
true
}).
and_call_original
expect
(
task_executor_service
).
not_to
receive
(
:execute
)
expect
(
described_class
).
to
receive
(
:perform_async
).
with
(
described_class
::
INITIAL_TASK
,
{})
expect
(
perform
).
to
be
false
end
end
end
end
end
end
end
end
...
...
此差异已折叠。
点击以展开。
预览
0%
加载中
请重试
或
添加新附件
.
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
保存评论
取消
想要评论请
注册
或
登录