From 7d2477d81bcc2d035be26587802706f7098b6e44 Mon Sep 17 00:00:00 2001
From: George Koltsov <gkoltsov@gitlab.com>
Date: Mon, 17 Jul 2023 12:53:10 +0100
Subject: [PATCH] Update BulkImports::PipelineBatchWorker resource boundary
Changelog: other
---
app/workers/all_queues.yml | 2 +-
app/workers/bulk_imports/pipeline_batch_worker.rb | 1 +
spec/commands/sidekiq_cluster/cli_spec.rb | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index 9e341fb92633c..b8583a4726288 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -2438,7 +2438,7 @@
:feature_category: :importers
:has_external_dependencies: true
:urgency: :low
- :resource_boundary: :unknown
+ :resource_boundary: :memory
:weight: 1
:idempotent: false
:tags: []
diff --git a/app/workers/bulk_imports/pipeline_batch_worker.rb b/app/workers/bulk_imports/pipeline_batch_worker.rb
index 378eff99b5254..634d7ed3c872c 100644
--- a/app/workers/bulk_imports/pipeline_batch_worker.rb
+++ b/app/workers/bulk_imports/pipeline_batch_worker.rb
@@ -9,6 +9,7 @@ class PipelineBatchWorker # rubocop:disable Scalability/IdempotentWorker
feature_category :importers
sidekiq_options retry: false, dead: false
worker_has_external_dependencies!
+ worker_resource_boundary :memory
def perform(batch_id)
@batch = ::BulkImports::BatchTracker.find(batch_id)
diff --git a/spec/commands/sidekiq_cluster/cli_spec.rb b/spec/commands/sidekiq_cluster/cli_spec.rb
index a63e7158c2a26..09e40d8f91a25 100644
--- a/spec/commands/sidekiq_cluster/cli_spec.rb
+++ b/spec/commands/sidekiq_cluster/cli_spec.rb
@@ -248,13 +248,13 @@
if Gitlab.ee?
[
%w[incident_management_close_incident status_page_publish] + described_class::DEFAULT_QUEUES,
- %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] +
+ %w[bulk_imports_pipeline bulk_imports_pipeline_batch bulk_imports_relation_export project_export projects_import_export_parallel_project_export projects_import_export_relation_export repository_import project_template_export] +
described_class::DEFAULT_QUEUES
]
else
[
%w[incident_management_close_incident] + described_class::DEFAULT_QUEUES,
- %w[bulk_imports_pipeline bulk_imports_relation_export project_export projects_import_export_parallel_project_export projects_import_export_relation_export repository_import] +
+ %w[bulk_imports_pipeline bulk_imports_pipeline_batch bulk_imports_relation_export project_export projects_import_export_parallel_project_export projects_import_export_relation_export repository_import] +
described_class::DEFAULT_QUEUES
]
end
--
GitLab