From 9fd31eb469de5099f7a7b44840d7930bc3c42bbe Mon Sep 17 00:00:00 2001 From: Gabriel Mazetto Date: Tue, 21 Nov 2017 00:23:43 +0100 Subject: [PATCH] Raises error when migration cannot happen so job is cancelled --- .../projects/hashed_storage/migrate_attachments_service.rb | 4 +++- .../hashed_storage/migrate_attachments_service_spec.rb | 7 ++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/services/projects/hashed_storage/migrate_attachments_service.rb b/app/services/projects/hashed_storage/migrate_attachments_service.rb index 68b9a72661c..26026899ebe 100644 --- a/app/services/projects/hashed_storage/migrate_attachments_service.rb +++ b/app/services/projects/hashed_storage/migrate_attachments_service.rb @@ -1,5 +1,7 @@ module Projects module HashedStorage + AttachmentMigrationError = Class.new(StandardError) + class MigrateAttachmentsService < BaseService attr_reader :logger @@ -27,7 +29,7 @@ module Projects if File.exist?(new_path) logger.error("Cannot migrate attachments from '#{old_path}' to '#{new_path}', target path already exist (PROJECT_ID=#{project.id})") - return + raise AttachmentMigrationError, "Target path '#{new_path}' already exist" end # Create hashed storage base path folder diff --git a/spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb b/spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb index ce43a7e4d54..de2abfc1985 100644 --- a/spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb +++ b/spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb @@ -49,13 +49,10 @@ describe Projects::HashedStorage::MigrateAttachmentsService do FileUtils.mkdir_p(base_path(hashed_storage)) end - it 'skips moving the file and goes to next' do + it 'raises AttachmentMigrationError' do expect(FileUtils).not_to receive(:mv).with(base_path(legacy_storage), base_path(hashed_storage)) - service.execute - - expect(File.exist?(base_path(legacy_storage))).to be_truthy - expect(File.file?(old_path)).to be_truthy + expect { service.execute }.to raise_error(Projects::HashedStorage::AttachmentMigrationError) end end end