Skip to content
代码片段 群组 项目
提交 0bce3caf 编辑于 作者: Miguel Rincon's avatar Miguel Rincon
浏览文件

Merge branch 'tch-fix-nan-on-advanced-search-admin-ui' into 'master'

Zero downtime reindex: show 100% if 0 expected documents

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104883



Merged-by: default avatarMiguel Rincon <mrincon@gitlab.com>
Approved-by: default avatarSiddharth Dungarwal <sdungarwal@gitlab.com>
Approved-by: default avatarDmitry Gruzd <dgruzd@gitlab.com>
Approved-by: default avatarTomas Bulva <tbulva@gitlab.com>
Approved-by: default avatarMichael Fangman <mfangman@gitlab.com>
Approved-by: default avatarMiguel Rincon <mrincon@gitlab.com>
Co-authored-by: default avatarTerri Chu <tchu@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
- processed_documents = subtask.documents_count_target - processed_documents = subtask.documents_count_target
%p= _('Expected documents: %{expected_documents}') % { expected_documents: expected_documents } %p= _('Expected documents: %{expected_documents}') % { expected_documents: expected_documents }
- if processed_documents && expected_documents - if processed_documents && expected_documents
- percentage = ((processed_documents / expected_documents.to_f) * 100).round(2) - percentage = expected_documents > 0 ? ((processed_documents / expected_documents.to_f) * 100).round(2) : 100
%p= _('Documents reindexed: %{processed_documents} (%{percentage}%%)') % { processed_documents: processed_documents, percentage: percentage } %p= _('Documents reindexed: %{processed_documents} (%{percentage}%%)') % { processed_documents: processed_documents, percentage: percentage }
.progress .progress
.progress-bar{ "aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => percentage, :role => "progressbar", :style => "width: #{percentage}%" } .progress-bar{ "aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => percentage, :role => "progressbar", :style => "width: #{percentage}%" }
...@@ -177,6 +177,18 @@ ...@@ -177,6 +177,18 @@
expect(rendered).not_to include("Documents reindexed:") expect(rendered).not_to include("Documents reindexed:")
end end
end end
context 'when there are 0 documents expected' do
let_it_be(:task) { create(:elastic_reindexing_task, state: :reindexing) }
let_it_be(:subtask) { create(:elastic_reindexing_subtask, elastic_reindexing_task: task, documents_count_target: 0, documents_count: 0) }
it 'renders 100% completed progress' do
render
expect(rendered).to include('Expected documents: 0')
expect(rendered).to include('Documents reindexed: 0 (100%)')
end
end
end end
context 'when there are elasticsearch indexed namespaces' do context 'when there are elasticsearch indexed namespaces' do
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册