Merge branch '56618-hashed-storage-skip-validation' into 'master'

Resolve "Hashed storage migration should not be attempted if project does not validate"

Closes #56618

See merge request gitlab-org/gitlab-ce!25753

app/services/projects/hashed_storage/migrate_attachments_service.rb

@@ -24,7 +24,7 @@ module Projects
         result = move_folder!(origin, target)
 
         if result
-          project.save!
+          project.save!(validate: false)
 
           yield if block_given?
         else

app/services/projects/hashed_storage/migrate_repository_service.rb

@@ -27,7 +27,7 @@ module Projects
         end
 
         project.repository_read_only = false
-        project.save!
+        project.save!(validate: false)
 
         if result && block_given?
           yield

app/services/projects/hashed_storage/rollback_attachments_service.rb

@@ -19,7 +19,7 @@ module Projects
         result = move_folder!(origin, target)
 
         if result
-          project.save!
+          project.save!(validate: false)
 
           yield if block_given?
         else

app/services/projects/hashed_storage/rollback_repository_service.rb

@@ -27,7 +27,7 @@ module Projects
         end
 
         project.repository_read_only = false
-        project.save!
+        project.save!(validate: false)
 
         if result && block_given?
           yield

changelogs/unreleased/56618-hashed-storage-skip-validation.yml

+---
+title: Skip Project validation during Hashed Storage migration or rollback
+merge_request: 25753
+author:
+type: fixed

spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb

@@ -76,6 +76,12 @@ describe Projects::HashedStorage::MigrateAttachmentsService do
         expect { service.execute }.to raise_error(Projects::HashedStorage::AttachmentCannotMoveError)
       end
     end
+
+    it 'works even when project validation fails' do
+      allow(project).to receive(:valid?) { false }
+
+      expect { service.execute }.to change { project.hashed_storage?(:attachments) }.to(true)
+    end
   end
 
   context '#old_disk_path' do

spec/services/projects/hashed_storage/migrate_repository_service_spec.rb

@@ -102,6 +102,12 @@ describe Projects::HashedStorage::MigrateRepositoryService do
       end
     end
 
+    it 'works even when project validation fails' do
+      allow(project).to receive(:valid?) { false }
+
+      expect { service.execute }.to change { project.hashed_storage?(:repository) }.to(true)
+    end
+
     def expect_move_repository(from_name, to_name)
       expect(gitlab_shell).to receive(:mv_repository).with(project.repository_storage, from_name, to_name).and_call_original
     end

spec/services/projects/hashed_storage/rollback_attachments_service_spec.rb

@@ -78,6 +78,12 @@ describe Projects::HashedStorage::RollbackAttachmentsService do
         expect { service.execute }.to raise_error(Projects::HashedStorage::AttachmentCannotMoveError)
       end
     end
+
+    it 'works even when project validation fails' do
+      allow(project).to receive(:valid?) { false }
+
+      expect { service.execute }.to change { project.hashed_storage?(:attachments) }.to(false)
+    end
   end
 
   context '#old_disk_path' do

spec/services/projects/hashed_storage/rollback_repository_service_spec.rb

@@ -104,6 +104,12 @@ describe Projects::HashedStorage::RollbackRepositoryService, :clean_gitlab_redis
       end
     end
 
+    it 'works even when project validation fails' do
+      allow(project).to receive(:valid?) { false }
+
+      expect { service.execute }.to change { project.legacy_storage? }.to(true)
+    end
+
     def expect_move_repository(from_name, to_name)
       expect(gitlab_shell).to receive(:mv_repository).with(project.repository_storage, from_name, to_name).and_call_original
     end