From b8e11d267cdd4a00807984f98a9d8d8cfa51602e Mon Sep 17 00:00:00 2001
From: George Koltsov <gkoltsov@gitlab.com>
Date: Thu, 23 Nov 2023 15:38:44 +0000
Subject: [PATCH] Mark RelationBatchExportWorker as memory bound

Changelog: other
---
 app/workers/all_queues.yml                               | 2 +-
 app/workers/bulk_imports/relation_batch_export_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 d30ff5ce4e6a4..d8e78e28b551f 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -2636,7 +2636,7 @@
   :feature_category: :importers
   :has_external_dependencies: false
   :urgency: :low
-  :resource_boundary: :unknown
+  :resource_boundary: :memory
   :weight: 1
   :idempotent: true
   :tags: []
diff --git a/app/workers/bulk_imports/relation_batch_export_worker.rb b/app/workers/bulk_imports/relation_batch_export_worker.rb
index a9ffb2b252d9e..08c5fb8146022 100644
--- a/app/workers/bulk_imports/relation_batch_export_worker.rb
+++ b/app/workers/bulk_imports/relation_batch_export_worker.rb
@@ -8,6 +8,7 @@ class RelationBatchExportWorker
     data_consistency :always # rubocop:disable SidekiqLoadBalancing/WorkerDataConsistency
     feature_category :importers
     sidekiq_options status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION, retry: 6
+    worker_resource_boundary :memory
 
     sidekiq_retries_exhausted do |job, exception|
       batch = BulkImports::ExportBatch.find(job['args'][1])
diff --git a/spec/commands/sidekiq_cluster/cli_spec.rb b/spec/commands/sidekiq_cluster/cli_spec.rb
index 5fdeb1fa900e9..ceee61fb30218 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_pipeline_batch 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_batch_export 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_pipeline_batch 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_batch_export 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