Add latest changes from gitlab-org/gitlab@16-0-stable-ee

2 files changed, 173 insertions, 0 deletions

diff --git a/app/workers/concerns/gitlab/bitbucket_server_import/object_importer.rb b/app/workers/concerns/gitlab/bitbucket_server_import/object_importer.rb
new file mode 100644
index 00000000000..b209719479b
--- /dev/null
+++ b/app/workers/concerns/gitlab/bitbucket_server_import/object_importer.rb
@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BitbucketServerImport
+    # ObjectImporter defines the base behaviour for every Sidekiq worker that
+    # imports a single resource such as a note or pull request.
+    module ObjectImporter
+      extend ActiveSupport::Concern
+
+      included do
+        include ApplicationWorker
+
+        data_consistency :always
+
+        feature_category :importers
+
+        worker_has_external_dependencies!
+
+        sidekiq_retries_exhausted do |msg|
+          args = msg['args']
+          jid = msg['jid']
+
+          # If a job is being exhausted we still want to notify the
+          # Gitlab::Import::AdvanceStageWorker to prevent the entire import from getting stuck
+          if args.length == 3 && (key = args.last) && key.is_a?(String)
+            JobWaiter.notify(key, jid)
+          end
+        end
+      end
+
+      def perform(project_id, hash, notify_key)
+        project = Project.find_by_id(project_id)
+
+        return unless project
+
+        if project.import_state&.canceled?
+          info(project.id, message: 'project import canceled')
+          return
+        end
+
+        import(project, hash)
+      ensure
+        notify_waiter(notify_key)
+      end
+
+      private
+
+      # project - An instance of `Project` to import the data into.
+      # hash - A Hash containing the details of the object to import.
+      def import(project, hash)
+        info(project.id, message: 'importer started')
+
+        importer_class.new(project, hash).execute
+
+        info(project.id, message: 'importer finished')
+      rescue ActiveRecord::RecordInvalid => e
+        # We do not raise exception to prevent job retry
+        track_exception(project, e)
+      rescue StandardError => e
+        track_and_raise_exception(project, e)
+      end
+
+      def notify_waiter(key)
+        JobWaiter.notify(key, jid)
+      end
+
+      # Returns the class to use for importing the object.
+      def importer_class
+        raise NotImplementedError
+      end
+
+      def info(project_id, extra = {})
+        Logger.info(log_attributes(project_id, extra))
+      end
+
+      def log_attributes(project_id, extra = {})
+        extra.merge(
+          project_id: project_id,
+          importer: importer_class.name
+        )
+      end
+
+      def track_exception(project, exception, fail_import: false)
+        Gitlab::Import::ImportFailureService.track(
+          project_id: project.id,
+          error_source: importer_class.name,
+          exception: exception,
+          fail_import: fail_import
+        )
+      end
+
+      def track_and_raise_exception(project, exception, fail_import: false)
+        track_exception(project, exception, fail_import: fail_import)
+
+        raise(exception)
+      end
+    end
+  end
+end
diff --git a/app/workers/concerns/gitlab/bitbucket_server_import/stage_methods.rb b/app/workers/concerns/gitlab/bitbucket_server_import/stage_methods.rb
new file mode 100644
index 00000000000..db4e71051c0
--- /dev/null
+++ b/app/workers/concerns/gitlab/bitbucket_server_import/stage_methods.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BitbucketServerImport
+    module StageMethods
+      extend ActiveSupport::Concern
+
+      included do
+        include ApplicationWorker
+
+        worker_has_external_dependencies!
+
+        feature_category :importers
+
+        data_consistency :always
+
+        sidekiq_options dead: false, retry: 3
+
+        sidekiq_retries_exhausted do |msg, e|
+          Gitlab::Import::ImportFailureService.track(
+            project_id: msg['args'][0],
+            exception: e,
+            fail_import: true
+          )
+        end
+      end
+
+      # project_id - The ID of the GitLab project to import the data into.
+      def perform(project_id)
+        info(project_id, message: 'starting stage')
+
+        return unless (project = find_project(project_id))
+
+        import(project)
+
+        info(project_id, message: 'stage finished')
+      rescue StandardError => e
+        Gitlab::Import::ImportFailureService.track(
+          project_id: project_id,
+          exception: e,
+          error_source: self.class.name,
+          fail_import: abort_on_failure
+        )
+
+        raise(e)
+      end
+
+      def find_project(id)
+        # If the project has been marked as failed we want to bail out
+        # automatically.
+        # rubocop: disable CodeReuse/ActiveRecord
+        Project.joins_import_state.where(import_state: { status: :started }).find_by_id(id)
+        # rubocop: enable CodeReuse/ActiveRecord
+      end
+
+      def abort_on_failure
+        false
+      end
+
+      private
+
+      def info(project_id, extra = {})
+        Logger.info(log_attributes(project_id, extra))
+      end
+
+      def log_attributes(project_id, extra = {})
+        extra.merge(
+          project_id: project_id,
+          import_stage: self.class.name
+        )
+      end
+    end
+  end
+end