diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 03:09:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 03:09:57 +0300 |
| commit | 9398d718d92a40a0a917040645a55dea51467a91 (patch) | |
| tree | ce1242c69221f1e6abd701439631cf6e6d1b948d /app/services/projects | |
| parent | 602ea42669779ec431bcaeb41fd95e079b1a7021 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/projects')
| -rw-r--r-- | app/services/projects/update_repository_storage_service.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/services/projects/update_repository_storage_service.rb b/app/services/projects/update_repository_storage_service.rb index 0602089a3ab..2e5de9411d1 100644 --- a/app/services/projects/update_repository_storage_service.rb +++ b/app/services/projects/update_repository_storage_service.rb @@ -5,12 +5,15 @@ module Projects include Gitlab::ShellAdapter Error = Class.new(StandardError) + SameFilesystemError = Class.new(Error) def initialize(project) @project = project end def execute(new_repository_storage_key) + raise SameFilesystemError if same_filesystem?(project.repository.storage, new_repository_storage_key) + mirror_repositories(new_repository_storage_key) mark_old_paths_for_archive @@ -33,6 +36,10 @@ module Projects private + def same_filesystem?(old_storage, new_storage) + Gitlab::GitalyClient.filesystem_id(old_storage) == Gitlab::GitalyClient.filesystem_id(new_storage) + end + def mirror_repositories(new_repository_storage_key) mirror_repository(new_repository_storage_key) |