Merge branch '8642-geo-disable-built-in-sidekiq-retry-for-verification-workers' into 'master'

Disable built-in Sidekiq retry for verification workers

Closes #8642

See merge request gitlab-org/gitlab-ee!14946

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

@@ -8,6 +8,8 @@ module Geo
         include GeoQueue
         include ExclusiveLeaseGuard
 
+        sidekiq_options retry: false
+
         LEASE_TIMEOUT = 1.hour.to_i
 
         attr_reader :project

ee/app/workers/geo/repository_verification/secondary/single_worker.rb

@@ -9,6 +9,8 @@ module Geo
         include ExclusiveLeaseGuard
         include Gitlab::Geo::ProjectLogHelpers
 
+        sidekiq_options retry: false
+
         LEASE_TIMEOUT = 1.hour.to_i
 
         attr_reader :registry

ee/changelogs/unreleased/8642-geo-disable-built-in-sidekiq-retry-for-verification-workers.yml

+---
+title: Geo - Disable built-in Sidekiq retry for verification workers
+merge_request: 14946
+author:
+type: fixed

ee/spec/workers/geo/repository_verification/primary/single_worker_spec.rb

@@ -12,6 +12,14 @@ describe Geo::RepositoryVerification::Primary::SingleWorker, :clean_gitlab_redis
     stub_current_geo_node(primary)
   end
 
+  it 'disables retrying of failed jobs' do
+    expect(subject.sidekiq_options_hash).to eq(
+      'retry' => false,
+      'queue' => 'geo:geo_repository_verification_primary_single',
+      'queue_namespace' => :geo
+    )
+  end
+
   describe '#perform' do
     it 'does not calculate the checksum when not running on a primary' do
       allow(Gitlab::Geo).to receive(:primary?) { false }

ee/spec/workers/geo/repository_verification/secondary/single_worker_spec.rb

@@ -12,6 +12,14 @@ describe Geo::RepositoryVerification::Secondary::SingleWorker, :clean_gitlab_red
     stub_current_geo_node(secondary)
   end
 
+  it 'disables retrying of failed jobs' do
+    expect(subject.sidekiq_options_hash).to eq(
+      'retry' => false,
+      'queue' => 'geo:geo_repository_verification_secondary_single',
+      'queue_namespace' => :geo
+    )
+  end
+
   describe '#perform' do
     it 'does not calculate the checksum when not running on a secondary' do
       allow(Gitlab::Geo).to receive(:secondary?) { false }