Skip to content
代码片段 群组 项目
提交 9edf1ccf 编辑于 作者: George Koltsov's avatar George Koltsov
浏览文件

Update import workers to set memory resource boundary

Changelog: other
上级 3c27037c
No related branches found
No related tags found
无相关合并请求
......@@ -2303,7 +2303,7 @@
:feature_category: :importers
:has_external_dependencies: true
:urgency: :low
:resource_boundary: :unknown
:resource_boundary: :memory
:weight: 1
:idempotent: false
:tags: []
......@@ -2312,7 +2312,7 @@
:feature_category: :importers
:has_external_dependencies: false
:urgency: :low
:resource_boundary: :unknown
:resource_boundary: :memory
:weight: 1
:idempotent: true
:tags: []
......@@ -3365,7 +3365,7 @@
:feature_category: :importers
:has_external_dependencies: true
:urgency: :low
:resource_boundary: :unknown
:resource_boundary: :memory
:weight: 1
:idempotent: false
:tags: []
......
......@@ -12,6 +12,7 @@ class PipelineWorker # rubocop:disable Scalability/IdempotentWorker
sidekiq_options retry: false, dead: false
worker_has_external_dependencies!
deduplicate :until_executing
worker_resource_boundary :memory
def perform(pipeline_tracker_id, stage, entity_id)
@entity = ::BulkImports::Entity.find(entity_id)
......
......@@ -11,6 +11,7 @@ class RelationExportWorker
data_consistency :always
feature_category :importers
sidekiq_options status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION
worker_resource_boundary :memory
def perform(user_id, portable_id, portable_class, relation)
user = User.find(user_id)
......
......@@ -12,6 +12,7 @@ class RepositoryImportWorker # rubocop:disable Scalability/IdempotentWorker
# Do not retry on Import/Export until https://gitlab.com/gitlab-org/gitlab/-/issues/16812 is solved.
sidekiq_options retry: false, dead: false
sidekiq_options status_expiration: Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION
worker_resource_boundary :memory
# technical debt: https://gitlab.com/gitlab-org/gitlab/issues/33991
sidekiq_options memory_killer_memory_growth_kb: ENV.fetch('MEMORY_KILLER_REPOSITORY_IMPORT_WORKER_MEMORY_GROWTH_KB', 50).to_i
......
......@@ -246,12 +246,12 @@
if Gitlab.ee?
[
%w[cronjob:clusters_integrations_check_prometheus_health incident_management_close_incident status_page_publish],
%w[project_export projects_import_export_parallel_project_export projects_import_export_relation_export project_template_export]
%w[bulk_imports_pipeline bulk_imports_relation_export project_export projects_import_export_parallel_project_export projects_import_export_relation_export repository_import project_template_export]
]
else
[
%w[cronjob:clusters_integrations_check_prometheus_health incident_management_close_incident],
%w[project_export projects_import_export_parallel_project_export projects_import_export_relation_export]
%w[bulk_imports_pipeline bulk_imports_relation_export project_export projects_import_export_parallel_project_export projects_import_export_relation_export repository_import]
]
end
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册