Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

3 files changed, 19 insertions, 7 deletions

diff --git a/app/workers/concerns/gitlab/github_import/object_importer.rb b/app/workers/concerns/gitlab/github_import/object_importer.rb
index 575cd4862b0..6ebf7c7c263 100644
--- a/app/workers/concerns/gitlab/github_import/object_importer.rb
+++ b/app/workers/concerns/gitlab/github_import/object_importer.rb
@@ -9,6 +9,8 @@ module Gitlab
 
       included do
         include ApplicationWorker
+
+        sidekiq_options retry: 3
         include GithubImport::Queue
         include ReschedulingMethods
         include Gitlab::NotifyUponDeath
@@ -25,15 +27,19 @@ module Gitlab
       # client - An instance of `Gitlab::GithubImport::Client`
       # hash - A Hash containing the details of the object to import.
       def import(project, client, hash)
+        object = representation_class.from_json_hash(hash)
+
+        # To better express in the logs what object is being imported.
+        self.github_id = object.attributes.fetch(:github_id)
+
         info(project.id, message: 'starting importer')
 
-        object = representation_class.from_json_hash(hash)
         importer_class.new(object, project, client).execute
 
         counter.increment
         info(project.id, message: 'importer finished')
-      rescue => e
-        error(project.id, e)
+      rescue StandardError => e
+        error(project.id, e, hash)
       end
 
       def counter
@@ -63,16 +69,19 @@ module Gitlab
 
       private
 
+      attr_accessor :github_id
+
       def info(project_id, extra = {})
         logger.info(log_attributes(project_id, extra))
       end
 
-      def error(project_id, exception)
+      def error(project_id, exception, data = {})
         logger.error(
           log_attributes(
             project_id,
             message: 'importer failed',
-            'error.message': exception.message
+            'error.message': exception.message,
+            'github.data': data
           )
         )
 
@@ -86,7 +95,8 @@ module Gitlab
         extra.merge(
           import_source: :github,
           project_id: project_id,
-          importer: importer_class.name
+          importer: importer_class.name,
+          github_id: github_id
         )
       end
     end
diff --git a/app/workers/concerns/gitlab/github_import/stage_methods.rb b/app/workers/concerns/gitlab/github_import/stage_methods.rb
index e5985fb94da..916b273a28f 100644
--- a/app/workers/concerns/gitlab/github_import/stage_methods.rb
+++ b/app/workers/concerns/gitlab/github_import/stage_methods.rb
@@ -14,7 +14,7 @@ module Gitlab
         try_import(client, project)
 
         info(project_id, message: 'stage finished')
-      rescue => e
+      rescue StandardError => e
         error(project_id, e)
       end
 
diff --git a/app/workers/concerns/gitlab/jira_import/import_worker.rb b/app/workers/concerns/gitlab/jira_import/import_worker.rb
index fdc6e64bbaa..107b6e2e9be 100644
--- a/app/workers/concerns/gitlab/jira_import/import_worker.rb
+++ b/app/workers/concerns/gitlab/jira_import/import_worker.rb
@@ -7,6 +7,8 @@ module Gitlab
 
       included do
         include ApplicationWorker
+
+        sidekiq_options retry: 3
         include ProjectImportOptions
         include Gitlab::JiraImport::QueueOptions
       end