1 files changed, 10 insertions, 7 deletions
diff --git a/lib/gitlab/background_migration/reset_duplicate_ci_runners_token_encrypted_values_on_projects.rb b/lib/gitlab/background_migration/reset_duplicate_ci_runners_token_encrypted_values_on_projects.rb
index 80ca76ef37f..190e2fc22fb 100644
--- a/lib/gitlab/background_migration/reset_duplicate_ci_runners_token_encrypted_values_on_projects.rb
+++ b/lib/gitlab/background_migration/reset_duplicate_ci_runners_token_encrypted_values_on_projects.rb
@@ -5,24 +5,24 @@ module Gitlab
     # A job to nullify duplicate runners_token_encrypted values in projects table in batches
     class ResetDuplicateCiRunnersTokenEncryptedValuesOnProjects
       class Project < ActiveRecord::Base # rubocop:disable Style/Documentation
-        include ::EachBatch
+        include EachBatch
 
         self.table_name = 'projects'
 
-        scope :base_query, -> do
-          where.not(runners_token_encrypted: nil)
-        end
+        scope :base_query, -> { where.not(runners_token_encrypted: nil) }
       end
 
       def perform(start_id, end_id)
         # Reset duplicate runner tokens that would prevent creating an unique index.
+        batch_records = Project.base_query.where(id: start_id..end_id)
+
         duplicate_tokens = Project.base_query
-          .where(id: start_id..end_id)
+          .where(runners_token_encrypted: batch_records.select(:runners_token_encrypted).distinct)
           .group(:runners_token_encrypted)
           .having('COUNT(*) > 1')
           .pluck(:runners_token_encrypted)
 
-        Project.where(runners_token_encrypted: duplicate_tokens).update_all(runners_token_encrypted: nil) if duplicate_tokens.any?
+        batch_records.where(runners_token_encrypted: duplicate_tokens).update_all(runners_token_encrypted: nil) if duplicate_tokens.any?
 
         mark_job_as_succeeded(start_id, end_id)
       end
@@ -30,7 +30,10 @@ module Gitlab
       private
 
       def mark_job_as_succeeded(*arguments)
-        Gitlab::Database::BackgroundMigrationJob.mark_all_as_succeeded('ResetDuplicateCiRunnersTokenEncryptedValuesOnProjects', arguments)
+        ::Gitlab::Database::BackgroundMigrationJob.mark_all_as_succeeded(
+          self.class.name.demodulize,
+          arguments
+        )
       end
     end
   end