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

4 files changed, 10 insertions, 1 deletions

diff --git a/app/workers/projects/git_garbage_collect_worker.rb b/app/workers/projects/git_garbage_collect_worker.rb
index 4f908529b34..0d67a8ac30e 100644
--- a/app/workers/projects/git_garbage_collect_worker.rb
+++ b/app/workers/projects/git_garbage_collect_worker.rb
@@ -5,6 +5,8 @@ module Projects
     extend ::Gitlab::Utils::Override
     include GitGarbageCollectMethods
 
+    tags :exclude_from_kubernetes
+
     private
 
     override :find_resource
@@ -24,7 +26,7 @@ module Projects
       return if Gitlab::Database.read_only? # GitGarbageCollectWorker may be run on a Geo secondary
 
       ::Gitlab::Cleanup::OrphanLfsFileReferences.new(resource, dry_run: false, logger: logger).run!
-    rescue => err
+    rescue StandardError => err
       Gitlab::GitLogger.warn(message: "Cleaning up orphan LFS objects files failed", error: err.message)
       Gitlab::ErrorTracking.track_and_raise_for_dev_exception(err)
     end
diff --git a/app/workers/projects/post_creation_worker.rb b/app/workers/projects/post_creation_worker.rb
index 2ca62e582b6..1970f79729f 100644
--- a/app/workers/projects/post_creation_worker.rb
+++ b/app/workers/projects/post_creation_worker.rb
@@ -4,7 +4,10 @@ module Projects
   class PostCreationWorker
     include ApplicationWorker
 
+    sidekiq_options retry: 3
+
     feature_category :source_code_management
+    tags :exclude_from_kubernetes
     idempotent!
 
     def perform(project_id)
diff --git a/app/workers/projects/schedule_bulk_repository_shard_moves_worker.rb b/app/workers/projects/schedule_bulk_repository_shard_moves_worker.rb
index 3841ae9b922..55530bff7c1 100644
--- a/app/workers/projects/schedule_bulk_repository_shard_moves_worker.rb
+++ b/app/workers/projects/schedule_bulk_repository_shard_moves_worker.rb
@@ -4,6 +4,8 @@ module Projects
   class ScheduleBulkRepositoryShardMovesWorker
     include ApplicationWorker
 
+    sidekiq_options retry: 3
+
     idempotent!
     feature_category :gitaly
     urgency :throttled
diff --git a/app/workers/projects/update_repository_storage_worker.rb b/app/workers/projects/update_repository_storage_worker.rb
index f4c44458446..1de1c95e043 100644
--- a/app/workers/projects/update_repository_storage_worker.rb
+++ b/app/workers/projects/update_repository_storage_worker.rb
@@ -5,6 +5,8 @@ module Projects
     extend ::Gitlab::Utils::Override
     include ::UpdateRepositoryStorageWorker
 
+    sidekiq_options retry: 3
+
     private
 
     override :find_repository_storage_move