Merge branch 'sh-delete-tags-outside-transaction' into 'master'

Delete container repository tags outside of transaction

Closes #51380

See merge request gitlab-org/gitlab-ce!21679

app/models/container_repository.rb

@@ -8,8 +8,6 @@ class ContainerRepository < ActiveRecord::Base
 
   delegate :client, to: :registry
 
-  before_destroy :delete_tags!
-
   # rubocop: disable CodeReuse/ServiceClass
   def registry
     @registry ||= begin

app/services/projects/container_repository/destroy_service.rb

@@ -6,6 +6,8 @@ module Projects
       def execute(container_repository)
         return false unless can?(current_user, :update_container_image, project)
 
+        # Delete tags outside of the transaction to avoid hitting an idle-in-transaction timeout
+        container_repository.delete_tags!
         container_repository.destroy
       end
     end

app/services/projects/destroy_service.rb

@@ -133,11 +133,11 @@ module Projects
     end
 
     def attempt_destroy_transaction(project)
-      Project.transaction do
+      unless remove_registry_tags
-        unless remove_legacy_registry_tags
         raise_error('Failed to remove some tags in project container registry. Please try again or contact administrator.')
       end
 
+      Project.transaction do
         log_destroy_event
         trash_repositories!
 
@@ -156,6 +156,17 @@ module Projects
       log_info("Attempting to destroy #{project.full_path} (#{project.id})")
     end
 
+    def remove_registry_tags
+      return false unless remove_legacy_registry_tags
+
+      project.container_repositories.find_each do |container_repository|
+        service = Projects::ContainerRepository::DestroyService.new(project, current_user)
+        service.execute(container_repository)
+      end
+
+      true
+    end
+
     ##
     # This method makes sure that we correctly remove registry tags
     # for legacy image repository (when repository path equals project path).

changelogs/unreleased/sh-delete-tags-outside-transaction.yml

@@ -0,0 +1,5 @@
+---
+title: Delete container repository tags outside of transaction
+merge_request: 21679
+author:
+type: fixed

spec/services/projects/container_repository/destroy_service_spec.rb

@@ -33,6 +33,7 @@ describe Projects::ContainerRepository::DestroyService do
       end
 
       it 'deletes the repository' do
+        expect(repository).to receive(:delete_tags!).and_call_original
         expect { described_class.new(project, user).execute(repository) }.to change { ContainerRepository.all.count }.by(-1)
       end
     end

spec/services/projects/destroy_service_spec.rb

@@ -204,7 +204,7 @@ describe Projects::DestroyService do
       context 'when image repository deletion fails' do
         it 'raises an exception' do
           expect_any_instance_of(ContainerRepository)
-            .to receive(:delete_tags!).and_return(false)
+            .to receive(:delete_tags!).and_raise(RuntimeError)
 
           expect(destroy_project(project, user)).to be false
         end