Commit e7df8070 authored by Robert Speicher's avatar Robert Speicher

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
parents 3f51ec21 311beef2
......@@ -8,8 +8,6 @@ class ContainerRepository < ActiveRecord::Base
delegate :client, to: :registry
before_destroy :delete_tags!
# rubocop: disable CodeReuse/ServiceClass
def registry
@registry ||= begin
......
......@@ -6,6 +6,8 @@ class DestroyService < BaseService
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
......
......@@ -133,11 +133,11 @@ def attempt_rollback(project, message)
end
def attempt_destroy_transaction(project)
Project.transaction do
unless remove_legacy_registry_tags
raise_error('Failed to remove some tags in project container registry. Please try again or contact administrator.')
end
unless remove_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 @@ def log_destroy_event
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).
......
---
title: Delete container repository tags outside of transaction
merge_request: 21679
author:
type: fixed
......@@ -33,6 +33,7 @@
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
......
......@@ -204,7 +204,7 @@
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment