Merge branch 'update-bang-elastic-commit-indexer' into 'master'

Fix IndexStatus find_or_create race condition

See merge request gitlab-org/gitlab!36266

ee/app/models/index_status.rb

@@ -7,7 +7,7 @@ class IndexStatus < ApplicationRecord
 
   sha_attribute :last_wiki_commit
 
-  validates :project_id, uniqueness: true, presence: true
+  validates :project_id, presence: true
 
   scope :for_project, ->(project_id) { where(project_id: project_id) }
 end

ee/changelogs/unreleased/update-bang-elastic-commit-indexer.yml

+---
+title: Fix bug with IndexStatus not being set on indexing project
+merge_request: 36266
+author:
+type: fixed

ee/lib/gitlab/elastic/indexer.rb

@@ -163,12 +163,7 @@ module Gitlab
 
         # An index_status should always be created,
         # even if the repository is empty, so we know it's been looked at.
-        @index_status ||=
-          begin
-            IndexStatus.find_or_create_by(project_id: project.id)
-          rescue ActiveRecord::RecordNotUnique
-            retry
-          end
+        @index_status ||= IndexStatus.safe_find_or_create_by!(project_id: project.id)
 
         attributes =
           if index_wiki?
@@ -177,7 +172,8 @@ module Gitlab
             { last_commit: to_sha, indexed_at: Time.now }
           end
 
-        @index_status.update(attributes)
+        @index_status.update!(attributes)
+
         project.reload_index_status
       end
       # rubocop: enable CodeReuse/ActiveRecord