Commit bd026b6a authored by Douwe Maan's avatar Douwe Maan

Merge branch 'bvl-dont-move-projects-using-hashed-storage' into 'master'

Don't move project repository/attachments when using hashed storage

Closes #40289

See merge request gitlab-org/gitlab-ce!15479
parents c4510a3b fa39e8a0
---
title: Don't move repositories and attachments for projects using hashed storage
merge_request: 15479
author:
type: other
...@@ -68,6 +68,11 @@ module Gitlab ...@@ -68,6 +68,11 @@ module Gitlab
has_one :route, as: :source has_one :route, as: :source
self.table_name = 'projects' self.table_name = 'projects'
HASHED_STORAGE_FEATURES = {
repository: 1,
attachments: 2
}.freeze
def repository_storage_path def repository_storage_path
Gitlab.config.repositories.storages[repository_storage]['path'] Gitlab.config.repositories.storages[repository_storage]['path']
end end
...@@ -76,6 +81,13 @@ module Gitlab ...@@ -76,6 +81,13 @@ module Gitlab
def self.name def self.name
'Project' 'Project'
end end
def hashed_storage?(feature)
raise ArgumentError, "Invalid feature" unless HASHED_STORAGE_FEATURES.include?(feature)
return false unless respond_to?(:storage_version)
self.storage_version && self.storage_version >= HASHED_STORAGE_FEATURES[feature]
end
end end
end end
end end
......
...@@ -22,9 +22,11 @@ module Gitlab ...@@ -22,9 +22,11 @@ module Gitlab
end end
def move_project_folders(project, old_full_path, new_full_path) def move_project_folders(project, old_full_path, new_full_path)
move_repository(project, old_full_path, new_full_path) unless project.hashed_storage?(:repository)
move_repository(project, "#{old_full_path}.wiki", "#{new_full_path}.wiki") move_repository(project, old_full_path, new_full_path)
move_uploads(old_full_path, new_full_path) move_repository(project, "#{old_full_path}.wiki", "#{new_full_path}.wiki")
end
move_uploads(old_full_path, new_full_path) unless project.hashed_storage?(:attachments)
move_pages(old_full_path, new_full_path) move_pages(old_full_path, new_full_path)
end end
......
...@@ -87,6 +87,14 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameProjects, :tr ...@@ -87,6 +87,14 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameProjects, :tr
subject.move_project_folders(project, 'known-parent/the-path', 'known-parent/the-path0') subject.move_project_folders(project, 'known-parent/the-path', 'known-parent/the-path0')
end end
it 'does not move the repositories when hashed storage is enabled' do
project.update!(storage_version: Project::HASHED_STORAGE_FEATURES[:repository])
expect(subject).not_to receive(:move_repository)
subject.move_project_folders(project, 'known-parent/the-path', 'known-parent/the-path0')
end
it 'moves uploads' do it 'moves uploads' do
expect(subject).to receive(:move_uploads) expect(subject).to receive(:move_uploads)
.with('known-parent/the-path', 'known-parent/the-path0') .with('known-parent/the-path', 'known-parent/the-path0')
...@@ -94,6 +102,14 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameProjects, :tr ...@@ -94,6 +102,14 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameProjects, :tr
subject.move_project_folders(project, 'known-parent/the-path', 'known-parent/the-path0') subject.move_project_folders(project, 'known-parent/the-path', 'known-parent/the-path0')
end end
it 'does not move uploads when hashed storage is enabled for attachments' do
project.update!(storage_version: Project::HASHED_STORAGE_FEATURES[:attachments])
expect(subject).not_to receive(:move_uploads)
subject.move_project_folders(project, 'known-parent/the-path', 'known-parent/the-path0')
end
it 'moves pages' do it 'moves pages' do
expect(subject).to receive(:move_pages) expect(subject).to receive(:move_pages)
.with('known-parent/the-path', 'known-parent/the-path0') .with('known-parent/the-path', 'known-parent/the-path0')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment