Merge branch...

Merge branch '288812-properly-catch-tags-delete-errors-and-mark-repository-as-cleanup-unfinished' into 'master'

Add error handling in the container registry delete tags service

See merge request gitlab-org/gitlab!50763

app/services/projects/container_repository/gitlab/delete_tags_service.rb

@@ -24,9 +24,9 @@ module Projects
           return success(deleted: []) if @tag_names.empty?
 
           delete_tags
-        rescue TimeoutError => e
+        rescue => e
           ::Gitlab::ErrorTracking.track_exception(e, tags_count: @tag_names&.size, container_repository_id: @container_repository&.id)
-          error('timeout while deleting tags', nil, pass_back: { deleted: @deleted_tags })
+          error('error while deleting tags', nil, pass_back: { deleted: @deleted_tags, exception_class_name: e.class.name })
         end
 
         private

changelogs/unreleased/288812-properly-catch-tags-delete-errors-and-mark-repository-as-cleanup-u.yml

+---
+title: Add error handling in the container registry delete tags service
+merge_request: 50763
+author:
+type: changed

spec/services/projects/container_repository/delete_tags_service_spec.rb

@@ -119,9 +119,9 @@ RSpec.describe Projects::ContainerRepository::DeleteTagsService do
           end
         end
 
-        it { is_expected.to include(status: :error, message: 'timeout while deleting tags') }
+        it { is_expected.to include(status: :error, message: 'error while deleting tags') }
 
-        it_behaves_like 'logging an error response', message: 'timeout while deleting tags', extra_log: { deleted_tags_count: 0 }
+        it_behaves_like 'logging an error response', message: 'error while deleting tags', extra_log: { deleted_tags_count: 0 }
       end
     end
   end

spec/services/projects/container_repository/gitlab/delete_tags_service_spec.rb

@@ -67,7 +67,7 @@ RSpec.describe Projects::ContainerRepository::Gitlab::DeleteTagsService do
               stub_delete_reference_requests('A' => 200)
             end
 
-            it { is_expected.to eq(status: :error, message: 'timeout while deleting tags', deleted: ['A']) }
+            it { is_expected.to eq(status: :error, message: 'error while deleting tags', deleted: ['A'], exception_class_name: Projects::ContainerRepository::Gitlab::DeleteTagsService::TimeoutError.name) }
 
             it 'tracks the exception' do
               expect(::Gitlab::ErrorTracking)
@@ -89,6 +89,21 @@ RSpec.describe Projects::ContainerRepository::Gitlab::DeleteTagsService do
             it_behaves_like 'deleting tags'
           end
         end
+
+        context 'with a network error' do
+          before do
+            expect(service).to receive(:delete_tags).and_raise(::Faraday::TimeoutError)
+          end
+
+          it { is_expected.to eq(status: :error, message: 'error while deleting tags', deleted: [], exception_class_name: ::Faraday::TimeoutError.name) }
+
+          it 'tracks the exception' do
+            expect(::Gitlab::ErrorTracking)
+              .to receive(:track_exception).with(::Faraday::TimeoutError, tags_count: tags.size, container_repository_id: repository.id)
+
+            subject
+          end
+        end
       end
     end