Merge branch 'mk/tweak-sidekiq-retries-of-geo-jobs' into 'master'

Geo: Tweak sidekiq retries of some Geo jobs

See merge request gitlab-org/gitlab!71419

ee/app/workers/geo/container_repository_sync_worker.rb

@@ -8,7 +8,7 @@ module Geo
     include GeoQueue
     include Gitlab::Geo::LogHelpers
 
-    sidekiq_options retry: 3, dead: false
+    sidekiq_options retry: 1, dead: false
 
     sidekiq_retry_in { |count| 30 * count }
 

ee/app/workers/geo/design_repository_sync_worker.rb

@@ -8,7 +8,7 @@ module Geo
     include GeoQueue
     include Gitlab::Geo::LogHelpers
 
-    sidekiq_options retry: 3, dead: false
+    sidekiq_options retry: 1, dead: false
 
     sidekiq_retry_in { |count| 30 * count }
 

ee/app/workers/geo/hashed_storage_attachments_migration_worker.rb

@@ -6,7 +6,6 @@ module Geo
 
     data_consistency :always
 
-    sidekiq_options retry: 3
     include GeoQueue
 
     loggable_arguments 1, 2

ee/app/workers/geo/hashed_storage_migration_worker.rb

@@ -6,7 +6,6 @@ module Geo
 
     data_consistency :always
 
-    sidekiq_options retry: 3
     include GeoQueue
 
     loggable_arguments 1, 2, 2

ee/app/workers/geo/project_sync_worker.rb

@@ -8,7 +8,7 @@ module Geo
     include GeoQueue
     include Gitlab::Geo::LogHelpers
 
-    sidekiq_options retry: 3, dead: false
+    sidekiq_options retry: 1, dead: false
 
     sidekiq_retry_in { |count| 30 * count }
 

ee/app/workers/geo/repositories_clean_up_worker.rb

@@ -6,7 +6,6 @@ module Geo
 
     data_consistency :always
 
-    sidekiq_options retry: 3
     include ExclusiveLeaseGuard
     include GeoQueue
     include Gitlab::Geo::LogHelpers

ee/app/workers/geo/repository_verification/primary/shard_worker.rb

@@ -4,7 +4,6 @@ module Geo
   module RepositoryVerification
     module Primary
       class ShardWorker < Geo::Scheduler::Primary::SchedulerWorker # rubocop:disable Scalability/IdempotentWorker
-        sidekiq_options retry: false
         loggable_arguments 0
 
         attr_accessor :shard_name

ee/app/workers/geo/reverification_batch_worker.rb

@@ -6,7 +6,7 @@ module Geo
 
     data_consistency :always
 
-    sidekiq_options retry: 3
+    sidekiq_options retry: false
     include GeoQueue
     include LimitedCapacity::Worker
     include ::Gitlab::Geo::LogHelpers

ee/app/workers/geo/scheduler/scheduler_worker.rb

@@ -7,7 +7,7 @@ module Geo
 
       data_consistency :always
 
-      sidekiq_options retry: 3
+      sidekiq_options retry: false
       include GeoQueue
       include ExclusiveLeaseGuard
       include ::Gitlab::Geo::LogHelpers

ee/app/workers/geo/sync_timeout_cron_worker.rb

@@ -12,7 +12,7 @@ module Geo
     include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
 
     idempotent!
-    sidekiq_options retry: false, dead: false
+    sidekiq_options retry: false
     feature_category :geo_replication
 
     def perform

ee/app/workers/geo/verification_batch_worker.rb

@@ -6,7 +6,7 @@ module Geo
 
     data_consistency :always
 
-    sidekiq_options retry: 3
+    sidekiq_options retry: false
     include GeoQueue
     include LimitedCapacity::Worker
     include ::Gitlab::Geo::LogHelpers

ee/app/workers/geo/verification_timeout_worker.rb

@@ -10,7 +10,7 @@ module Geo
     include ::Gitlab::Geo::LogHelpers
 
     idempotent!
-    sidekiq_options retry: false, dead: false
+    sidekiq_options retry: false
     loggable_arguments 0
 
     def perform(replicable_name)

spec/workers/every_sidekiq_worker_spec.rb

@@ -236,28 +236,25 @@ RSpec.describe 'Every Sidekiq worker' do
         'FlushCounterIncrementsWorker' => 3,
         'Geo::Batch::ProjectRegistrySchedulerWorker' => 3,
         'Geo::Batch::ProjectRegistryWorker' => 3,
-        'Geo::ContainerRepositorySyncWorker' => 3,
+        'Geo::ContainerRepositorySyncWorker' => 1,
         'Geo::DesignRepositoryShardSyncWorker' => false,
-        'Geo::DesignRepositorySyncWorker' => 3,
+        'Geo::DesignRepositorySyncWorker' => 1,
         'Geo::DestroyWorker' => 3,
         'Geo::EventWorker' => 3,
         'Geo::FileDownloadWorker' => 3,
         'Geo::FileRegistryRemovalWorker' => 3,
         'Geo::FileRemovalWorker' => 3,
-        'Geo::HashedStorageAttachmentsMigrationWorker' => 3,
-        'Geo::HashedStorageMigrationWorker' => 3,
-        'Geo::ProjectSyncWorker' => 3,
+        'Geo::ProjectSyncWorker' => 1,
         'Geo::RenameRepositoryWorker' => 3,
-        'Geo::RepositoriesCleanUpWorker' => 3,
         'Geo::RepositoryCleanupWorker' => 3,
         'Geo::RepositoryShardSyncWorker' => false,
         'Geo::RepositoryVerification::Primary::ShardWorker' => false,
         'Geo::RepositoryVerification::Primary::SingleWorker' => false,
         'Geo::RepositoryVerification::Secondary::SingleWorker' => false,
         'Geo::ReverificationBatchWorker' => 0,
-        'Geo::Scheduler::Primary::SchedulerWorker' => 3,
-        'Geo::Scheduler::SchedulerWorker' => 3,
-        'Geo::Scheduler::Secondary::SchedulerWorker' => 3,
+        'Geo::Scheduler::Primary::SchedulerWorker' => false,
+        'Geo::Scheduler::SchedulerWorker' => false,
+        'Geo::Scheduler::Secondary::SchedulerWorker' => false,
         'Geo::VerificationBatchWorker' => 0,
         'Geo::VerificationStateBackfillWorker' => false,
         'Geo::VerificationTimeoutWorker' => false,