Merge branch '345598-registry-race-condition' into 'master'

Fix registry race condition

See merge request gitlab-org/gitlab!75483

app/models/container_repository.rb

@@ -145,9 +145,14 @@ class ContainerRepository < ApplicationRecord
              name: path.repository_name)
   end
 
-  def self.create_from_path!(path)
-    safe_find_or_create_by!(project: path.repository_project,
-                                 name: path.repository_name)
+  def self.find_or_create_from_path(path)
+    repository = safe_find_or_create_by(
+      project: path.repository_project,
+      name: path.repository_name
+    )
+    return repository if repository.persisted?
+
+    find_by_path!(path)
   end
 
   def self.build_root_repository(project)

app/services/auth/container_registry_authentication_service.rb

@@ -156,7 +156,7 @@ module Auth
       return if path.has_repository?
       return unless actions.include?('push')
 
-      ContainerRepository.create_from_path!(path)
+      ContainerRepository.find_or_create_from_path(path)
     end
 
     # Overridden in EE

spec/models/container_repository_spec.rb

@@ -223,9 +223,9 @@ RSpec.describe ContainerRepository do
     end
   end
 
-  describe '.create_from_path!' do
+  describe '.find_or_create_from_path' do
     let(:repository) do
-      described_class.create_from_path!(ContainerRegistry::Path.new(path))
+      described_class.find_or_create_from_path(ContainerRegistry::Path.new(path))
     end
 
     let(:repository_path) { ContainerRegistry::Path.new(path) }
@@ -291,6 +291,35 @@ RSpec.describe ContainerRepository do
         expect(repository.id).to eq(container_repository.id)
       end
     end
+
+    context 'when many of the same repository are created at the same time' do
+      let(:path) { ContainerRegistry::Path.new(project.full_path + '/some/image') }
+
+      it 'does not throw validation errors and only creates one repository' do
+        expect { repository_creation_race(path) }.to change { ContainerRepository.count }.by(1)
+      end
+
+      it 'retrieves a persisted repository for all concurrent calls' do
+        repositories = repository_creation_race(path).map(&:value)
+
+        expect(repositories).to all(be_persisted)
+      end
+    end
+
+    def repository_creation_race(path)
+      # create a race condition - structure from https://blog.arkency.com/2015/09/testing-race-conditions/
+      wait_for_it = true
+
+      threads = Array.new(10) do |i|
+        Thread.new do
+          true while wait_for_it
+
+          ::ContainerRepository.find_or_create_from_path(path)
+        end
+      end
+      wait_for_it = false
+      threads.each(&:join)
+    end
   end
 
   describe '.build_root_repository' do