Merge branch 'shard_move_capture_all_errors' into 'master'

Capture all errors when updating repository storage

See merge request gitlab-org/gitlab!30119

app/services/projects/update_repository_storage_service.rb

@@ -18,7 +18,7 @@ module Projects
 
       mark_old_paths_for_archive
 
-      project.update(repository_storage: new_repository_storage_key, repository_read_only: false)
+      project.update!(repository_storage: new_repository_storage_key, repository_read_only: false)
       project.leave_pool_repository
       project.track_project_repository
 
@@ -26,8 +26,8 @@ module Projects
 
       success
 
-    rescue Error, ArgumentError, Gitlab::Git::BaseError => e
-      project.update(repository_read_only: false)
+    rescue StandardError => e
+      project.update!(repository_read_only: false)
 
       Gitlab::ErrorTracking.track_exception(e, project_path: project.full_path)
 

changelogs/unreleased/shard_move_capture_all_errors.yml

+---
+title: Capture all errors when updating repository storage
+merge_request: 30119
+author:
+type: fixed

ee/spec/services/projects/update_repository_storage_service_spec.rb

@@ -7,6 +7,10 @@ describe Projects::UpdateRepositoryStorageService do
 
   subject { described_class.new(project) }
 
+  before do
+    allow(Gitlab.config.repositories.storages).to receive(:keys).and_return(%w[default test_second_storage])
+  end
+
   describe "#execute" do
     context 'with design repository' do
       include_examples 'moves repository to another storage', 'design' do

spec/services/projects/update_repository_storage_service_spec.rb

@@ -12,6 +12,7 @@ describe Projects::UpdateRepositoryStorageService do
 
     before do
       allow(Time).to receive(:now).and_return(time)
+      allow(Gitlab.config.repositories.storages).to receive(:keys).and_return(%w[default test_second_storage])
     end
 
     context 'without wiki and design repository' do