Merge branch 'kassio/dont-use-dead-queue-for-import-workers' into 'master'

Do not send import/export workers to dead queue

See merge request gitlab-org/gitlab!44810

app/workers/group_export_worker.rb

@@ -6,7 +6,7 @@ class GroupExportWorker # rubocop:disable Scalability/IdempotentWorker
 
   feature_category :importers
   loggable_arguments 2
-  sidekiq_options retry: false
+  sidekiq_options retry: false, dead: false
 
   def perform(current_user_id, group_id, params = {})
     current_user = User.find(current_user_id)

app/workers/group_import_worker.rb

@@ -3,7 +3,7 @@
 class GroupImportWorker # rubocop:disable Scalability/IdempotentWorker
   include ApplicationWorker
 
-  sidekiq_options retry: false
+  sidekiq_options retry: false, dead: false
   feature_category :importers
 
   def perform(user_id, group_id)

app/workers/project_export_worker.rb

@@ -8,7 +8,7 @@ class ProjectExportWorker # rubocop:disable Scalability/IdempotentWorker
   worker_resource_boundary :memory
   urgency :throttled
   loggable_arguments 2, 3
-  sidekiq_options retry: false
+  sidekiq_options retry: false, dead: false
   sidekiq_options status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION
 
   def perform(current_user_id, project_id, after_export_strategy = {}, params = {})

app/workers/repository_import_worker.rb

@@ -8,7 +8,7 @@ class RepositoryImportWorker # rubocop:disable Scalability/IdempotentWorker
   feature_category :importers
   worker_has_external_dependencies!
   # Do not retry on Import/Export until https://gitlab.com/gitlab-org/gitlab/-/issues/16812 is solved.
-  sidekiq_options retry: false
+  sidekiq_options retry: false, dead: false
   sidekiq_options status_expiration: Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION
 
   # technical debt: https://gitlab.com/gitlab-org/gitlab/issues/33991

ee/spec/workers/repository_import_worker_spec.rb

@@ -41,6 +41,10 @@ RSpec.describe RepositoryImportWorker do
       expect(described_class.sidekiq_options['retry']).to eq(false)
     end
 
+    it 'disables dead' do
+      expect(described_class.sidekiq_options['dead']).to eq(false)
+    end
+
     it 'sets default status expiration' do
       expect(described_class.sidekiq_options['status_expiration']).to eq(Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION)
     end

spec/workers/group_export_worker_spec.rb

@@ -26,4 +26,14 @@ RSpec.describe GroupExportWorker do
       end
     end
   end
+
+  describe 'sidekiq options' do
+    it 'disables retry' do
+      expect(described_class.sidekiq_options['retry']).to eq(false)
+    end
+
+    it 'disables dead' do
+      expect(described_class.sidekiq_options['dead']).to eq(false)
+    end
+  end
 end

spec/workers/group_import_worker_spec.rb

@@ -16,6 +16,16 @@ RSpec.describe GroupImportWorker do
     end
   end
 
+  describe 'sidekiq options' do
+    it 'disables retry' do
+      expect(described_class.sidekiq_options['retry']).to eq(false)
+    end
+
+    it 'disables dead' do
+      expect(described_class.sidekiq_options['dead']).to eq(false)
+    end
+  end
+
   describe '#perform' do
     context 'when it succeeds' do
       before do

spec/workers/project_export_worker_spec.rb

@@ -75,6 +75,10 @@ RSpec.describe ProjectExportWorker do
       expect(described_class.sidekiq_options['retry']).to eq(false)
     end
 
+    it 'disables dead' do
+      expect(described_class.sidekiq_options['dead']).to eq(false)
+    end
+
     it 'sets default status expiration' do
       expect(described_class.sidekiq_options['status_expiration']).to eq(StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION)
     end