Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 35 insertions, 6 deletions

diff --git a/spec/support/shared_examples/services/projects/update_repository_storage_service_shared_examples.rb b/spec/support/shared_examples/services/projects/update_repository_storage_service_shared_examples.rb
index 2ddbdebdb97..f201c7b1780 100644
--- a/spec/support/shared_examples/services/projects/update_repository_storage_service_shared_examples.rb
+++ b/spec/support/shared_examples/services/projects/update_repository_storage_service_shared_examples.rb
@@ -2,9 +2,11 @@
 
 RSpec.shared_examples 'moves repository to another storage' do |repository_type|
   let(:project_repository_double) { double(:repository) }
+  let(:original_project_repository_double) { double(:repository) }
   let!(:project_repository_checksum) { project.repository.checksum }
 
   let(:repository_double) { double(:repository) }
+  let(:original_repository_double) { double(:repository) }
   let(:repository_checksum) { repository.checksum }
 
   before do
@@ -14,10 +16,16 @@ RSpec.shared_examples 'moves repository to another storage' do |repository_type|
     allow(Gitlab::Git::Repository).to receive(:new)
       .with('test_second_storage', project.repository.raw.relative_path, project.repository.gl_repository, project.repository.full_path)
       .and_return(project_repository_double)
+    allow(Gitlab::Git::Repository).to receive(:new)
+      .with('default', project.repository.raw.relative_path, nil, nil)
+      .and_return(original_project_repository_double)
 
     allow(Gitlab::Git::Repository).to receive(:new)
       .with('test_second_storage', repository.raw.relative_path, repository.gl_repository, repository.full_path)
       .and_return(repository_double)
+    allow(Gitlab::Git::Repository).to receive(:new)
+      .with('default', repository.raw.relative_path, nil, nil)
+      .and_return(original_repository_double)
   end
 
   context 'when the move succeeds', :clean_gitlab_redis_shared_state do
@@ -35,8 +43,8 @@ RSpec.shared_examples 'moves repository to another storage' do |repository_type|
       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
+      expect(original_project_repository_double).to receive(:remove)
+      expect(original_repository_double).to receive(:remove)
     end
 
     it "moves the project and its #{repository_type} repository to the new storage and unmarks the repository as read only" do
@@ -110,13 +118,36 @@ RSpec.shared_examples 'moves repository to another storage' do |repository_type|
         .with(repository.raw)
         .and_raise(Gitlab::Git::CommandError)
 
-      expect(GitlabShellWorker).not_to receive(:perform_async)
-
       result = subject.execute
 
       expect(result).to be_error
       expect(project).not_to be_repository_read_only
       expect(project.repository_storage).to eq('default')
+      expect(repository_storage_move).to be_failed
+    end
+  end
+
+  context "when the cleanup of the #{repository_type} repository fails" do
+    it 'sets the correct state' do
+      allow(Gitlab::GitalyClient).to receive(:filesystem_id).with('default').and_call_original
+      allow(Gitlab::GitalyClient).to receive(:filesystem_id).with('test_second_storage').and_return(SecureRandom.uuid)
+      allow(project_repository_double).to receive(:replicate)
+        .with(project.repository.raw)
+      allow(project_repository_double).to receive(:checksum)
+        .and_return(project_repository_checksum)
+      allow(original_project_repository_double).to receive(:remove)
+      allow(repository_double).to receive(:replicate)
+        .with(repository.raw)
+      allow(repository_double).to receive(:checksum)
+        .and_return(repository_checksum)
+
+      expect(original_repository_double).to receive(:remove)
+        .and_raise(Gitlab::Git::CommandError)
+
+      result = subject.execute
+
+      expect(result).to be_error
+      expect(repository_storage_move).to be_cleanup_failed
     end
   end
 
@@ -134,8 +165,6 @@ RSpec.shared_examples 'moves repository to another storage' do |repository_type|
       allow(repository_double).to receive(:checksum)
         .and_return('not matching checksum')
 
-      expect(GitlabShellWorker).not_to receive(:perform_async)
-
       result = subject.execute
 
       expect(result).to be_error