Merge branch 'geo-prevent-retry_due-name-collision' into 'master'

Geo: Prevent a name collision for retry_due scope

See merge request gitlab-org/gitlab!67875

ee/lib/gitlab/geo/verification_state.rb

@@ -36,8 +36,8 @@ module Gitlab
         scope :checksummed, -> { where.not(verification_checksum: nil) }
         scope :not_checksummed, -> { where(verification_checksum: nil) }
         scope :verification_timed_out, -> { verification_started.where("verification_started_at < ?", VERIFICATION_TIMEOUT.ago) }
-        scope :retry_due, -> { where(verification_arel_table[:verification_retry_at].eq(nil).or(verification_arel_table[:verification_retry_at].lt(Time.current))) }
-        scope :needs_verification, -> { available_verifiables.merge(with_verification_state(:verification_pending).or(with_verification_state(:verification_failed).retry_due)) }
+        scope :verification_retry_due, -> { where(verification_arel_table[:verification_retry_at].eq(nil).or(verification_arel_table[:verification_retry_at].lt(Time.current))) }
+        scope :needs_verification, -> { available_verifiables.merge(with_verification_state(:verification_pending).or(with_verification_state(:verification_failed).verification_retry_due)) }
         scope :needs_reverification, -> { verification_succeeded.where("verified_at < ?", ::Gitlab::Geo.current_node.minimum_reverification_interval.days.ago) }
         # rubocop:enable CodeReuse/ActiveRecord
 
@@ -133,7 +133,7 @@ module Gitlab
 
         # Overridden by Geo::VerifiableRegistry
         def verification_failed_batch_relation(batch_size:)
-          verification_failed.retry_due.order(Gitlab::Database.nulls_first_order(:verification_retry_at)).limit(batch_size) # rubocop:disable CodeReuse/ActiveRecord
+          verification_failed.verification_retry_due.order(Gitlab::Database.nulls_first_order(:verification_retry_at)).limit(batch_size) # rubocop:disable CodeReuse/ActiveRecord
         end
 
         # @return [Integer] number of records that need verification

ee/spec/lib/gitlab/geo/verification_state_spec.rb

@@ -179,7 +179,7 @@ RSpec.describe Gitlab::Geo::VerificationState do
       expect(subject.class.needs_verification).to include(subject)
     end
 
-    it 'includes verification_failed and retry_due' do
+    it 'includes verification_failed and verification_retry_due' do
       subject.verification_started
       subject.verification_failed_with_message!('foo')
       subject.update!(verification_retry_at: 1.minute.ago)