From ba174c982f40d71a87fd511b091753807174f7e7 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 6 Apr 2020 12:10:44 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/projects/hashed_storage/base_repository_service.rb | 8 +++++++- app/services/projects/hashed_storage/rollback_service.rb | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'app/services') diff --git a/app/services/projects/hashed_storage/base_repository_service.rb b/app/services/projects/hashed_storage/base_repository_service.rb index 09de8d9f0da..d81aa4de9f1 100644 --- a/app/services/projects/hashed_storage/base_repository_service.rb +++ b/app/services/projects/hashed_storage/base_repository_service.rb @@ -40,7 +40,13 @@ module Projects return true end - gitlab_shell.mv_repository(project.repository_storage, from_name, to_name) + gitlab_shell.mv_repository(project.repository_storage, from_name, to_name).tap do |moved| + if moved + logger.info("Repository moved from '#{from_name}' to '#{to_name}' (PROJECT_ID=#{project.id})") + else + logger.error("Repository cannot be moved from '#{from_name}' to '#{to_name}' (PROJECT_ID=#{project.id})") + end + end end def move_repositories diff --git a/app/services/projects/hashed_storage/rollback_service.rb b/app/services/projects/hashed_storage/rollback_service.rb index c437001c440..01b343a12d1 100644 --- a/app/services/projects/hashed_storage/rollback_service.rb +++ b/app/services/projects/hashed_storage/rollback_service.rb @@ -5,6 +5,12 @@ module Projects class RollbackService < BaseService attr_reader :logger, :old_disk_path + def initialize(project, old_disk_path, logger: nil) + @project = project + @old_disk_path = old_disk_path + @logger = logger || Gitlab::AppLogger + end + def execute # Rollback attachments from Hashed Storage to Legacy if project.hashed_storage?(:attachments) -- cgit v1.2.3