Merge branch 'fix_shard_move_archive' into 'master'

Ensure original repository is archived after a shard move

Closes #223128

See merge request gitlab-org/gitlab!34895

app/services/projects/update_repository_storage_service.rb

@@ -93,25 +93,25 @@ module Projects
       old_repository_storage = project.repository_storage
       new_project_path = moved_path(project.disk_path)
 
-      # Notice that the block passed to `run_after_commit` will run with `project`
+      # Notice that the block passed to `run_after_commit` will run with `repository_storage_move`
       # as its context
-      project.run_after_commit do
+      repository_storage_move.run_after_commit do
         GitlabShellWorker.perform_async(:mv_repository,
                                         old_repository_storage,
-                                        disk_path,
+                                        project.disk_path,
                                         new_project_path)
 
-        if wiki.repository_exists?
+        if project.wiki.repository_exists?
           GitlabShellWorker.perform_async(:mv_repository,
                                           old_repository_storage,
-                                          wiki.disk_path,
+                                          project.wiki.disk_path,
                                           "#{new_project_path}.wiki")
         end
 
-        if design_repository.exists?
+        if project.design_repository.exists?
           GitlabShellWorker.perform_async(:mv_repository,
                                           old_repository_storage,
-                                          design_repository.disk_path,
+                                          project.design_repository.disk_path,
                                           "#{new_project_path}.design")
         end
       end

changelogs/unreleased/fix_shard_move_archive.yml

+---
+title: Ensure original repository is archived after a shard move
+merge_request: 34895
+author:
+type: fixed

spec/services/projects/update_repository_storage_service_spec.rb

@@ -43,6 +43,8 @@ describe Projects::UpdateRepositoryStorageService do
             .with(project.repository.raw)
           expect(project_repository_double).to receive(:checksum)
             .and_return(checksum)
+          expect(GitlabShellWorker).to receive(:perform_async).with(:mv_repository, 'default', anything, anything)
+            .and_call_original
 
           result = subject.execute
 

spec/support/shared_examples/services/projects/update_repository_storage_service_shared_examples.rb

@@ -38,6 +38,9 @@ RSpec.shared_examples 'moves repository to another storage' do |repository_type|
         .with(repository.raw)
       allow(repository_double).to receive(:checksum)
         .and_return(repository_checksum)
+
+      expect(GitlabShellWorker).to receive(:perform_async).with(:mv_repository, 'default', anything, anything)
+        .twice.and_call_original
     end
 
     it "moves the project and its #{repository_type} repository to the new storage and unmarks the repository as read only" do