Add latest changes from gitlab-org/gitlab@master

4 files changed, 5 insertions, 27 deletions

diff --git a/app/workers/concerns/project_export_options.rb b/app/workers/concerns/project_export_options.rb
deleted file mode 100644
index e9318c1ba43..00000000000
--- a/app/workers/concerns/project_export_options.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module ProjectExportOptions
-  extend ActiveSupport::Concern
-
-  EXPORT_RETRY_COUNT = 3
-
-  included do
-    sidekiq_options retry: EXPORT_RETRY_COUNT, status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION
-
-    # We mark the project export as failed once we have exhausted all retries
-    sidekiq_retries_exhausted do |job|
-      project = Project.find(job['args'][1])
-      # rubocop: disable CodeReuse/ActiveRecord
-      job = project.export_jobs.find_by(jid: job["jid"])
-      # rubocop: enable CodeReuse/ActiveRecord
-
-      if job&.fail_op
-        Sidekiq.logger.info "Job #{job['jid']} for project #{project.id} has been set to failed state"
-      else
-        Sidekiq.logger.error "Failed to set Job #{job['jid']} for project #{project.id} to failed state"
-      end
-    end
-  end
-end
diff --git a/app/workers/group_export_worker.rb b/app/workers/group_export_worker.rb
index 6fd977e43d8..e22b691d35e 100644
--- a/app/workers/group_export_worker.rb
+++ b/app/workers/group_export_worker.rb
@@ -6,6 +6,7 @@ class GroupExportWorker # rubocop:disable Scalability/IdempotentWorker
 
   feature_category :importers
   loggable_arguments 2
+  sidekiq_options retry: false
 
   def perform(current_user_id, group_id, params = {})
     current_user = User.find(current_user_id)
diff --git a/app/workers/project_export_worker.rb b/app/workers/project_export_worker.rb
index d29348e85bc..6c8640138a1 100644
--- a/app/workers/project_export_worker.rb
+++ b/app/workers/project_export_worker.rb
@@ -3,12 +3,13 @@
 class ProjectExportWorker # rubocop:disable Scalability/IdempotentWorker
   include ApplicationWorker
   include ExceptionBacktrace
-  include ProjectExportOptions
 
   feature_category :importers
   worker_resource_boundary :memory
   urgency :throttled
   loggable_arguments 2, 3
+  sidekiq_options retry: false
+  sidekiq_options status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION
 
   def perform(current_user_id, project_id, after_export_strategy = {}, params = {})
     current_user = User.find(current_user_id)
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb
index 30570a2227e..54052bda675 100644
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
@@ -4,10 +4,11 @@ class RepositoryImportWorker # rubocop:disable Scalability/IdempotentWorker
   include ApplicationWorker
   include ExceptionBacktrace
   include ProjectStartImport
-  include ProjectImportOptions
 
   feature_category :importers
   worker_has_external_dependencies!
+  sidekiq_options retry: false
+  sidekiq_options status_expiration: Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION
 
   # 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