Commit 82f0365d authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'jc-remove-ensure-storage-path-exists' into 'master'

Remove ensure_storage_path_exists

Closes gitaly#1891

See merge request gitlab-org/gitlab!18347
parents 540454e0 77ddd7f4
...@@ -68,7 +68,7 @@ class Project < ApplicationRecord ...@@ -68,7 +68,7 @@ class Project < ApplicationRecord
:snippets_access_level, :builds_access_level, :repository_access_level, :snippets_access_level, :builds_access_level, :repository_access_level,
to: :project_feature, allow_nil: true to: :project_feature, allow_nil: true
delegate :base_dir, :disk_path, :ensure_storage_path_exists, to: :storage delegate :base_dir, :disk_path, to: :storage
delegate :scheduled?, :started?, :in_progress?, delegate :scheduled?, :started?, :in_progress?,
:failed?, :finished?, :failed?, :finished?,
...@@ -122,8 +122,6 @@ class Project < ApplicationRecord ...@@ -122,8 +122,6 @@ class Project < ApplicationRecord
# Storage specific hooks # Storage specific hooks
after_initialize :use_hashed_storage after_initialize :use_hashed_storage
after_create :check_repository_absence! after_create :check_repository_absence!
after_create :ensure_storage_path_exists
after_save :ensure_storage_path_exists, if: :saved_change_to_namespace_id?
acts_as_ordered_taggable acts_as_ordered_taggable
......
...@@ -27,14 +27,6 @@ module Storage ...@@ -27,14 +27,6 @@ module Storage
"#{base_dir}/#{disk_hash}" if disk_hash "#{base_dir}/#{disk_hash}" if disk_hash
end end
# TODO: remove this method entirely after 12.4 https://gitlab.com/gitlab-org/gitlab/issues/33244
# we no longer need ensure_storage_path_exists to call add_namespace since both creating and moving
# repositories will be preceded by a mkdir -p in gitaly to ensure the parent of the destination directory
# exists.
def ensure_storage_path_exists
true
end
def rename_repo(old_full_path: nil, new_full_path: nil) def rename_repo(old_full_path: nil, new_full_path: nil)
true true
end end
......
...@@ -23,16 +23,6 @@ module Storage ...@@ -23,16 +23,6 @@ module Storage
project.full_path project.full_path
end end
# TODO: remove this method entirely after 12.4 https://gitlab.com/gitlab-org/gitlab/issues/33244
# we no longer need ensure_storage_path_exists to call add_namespace since both creating and moving
# repositories will be preceded by a mkdir -p in gitaly to ensure the parent of the destination directory
# exists.
def ensure_storage_path_exists
return unless namespace
true
end
def rename_repo(old_full_path: nil, new_full_path: nil) def rename_repo(old_full_path: nil, new_full_path: nil)
old_full_path ||= project.full_path_before_last_save old_full_path ||= project.full_path_before_last_save
new_full_path ||= project.build_full_path new_full_path ||= project.build_full_path
......
...@@ -8,7 +8,6 @@ module Projects ...@@ -8,7 +8,6 @@ module Projects
@old_storage_version = project.storage_version @old_storage_version = project.storage_version
project.storage_version = ::Project::HASHED_STORAGE_FEATURES[:repository] project.storage_version = ::Project::HASHED_STORAGE_FEATURES[:repository]
project.ensure_storage_path_exists
@new_disk_path = project.disk_path @new_disk_path = project.disk_path
......
...@@ -8,7 +8,6 @@ module Projects ...@@ -8,7 +8,6 @@ module Projects
@old_storage_version = project.storage_version @old_storage_version = project.storage_version
project.storage_version = nil project.storage_version = nil
project.ensure_storage_path_exists
@new_disk_path = project.disk_path @new_disk_path = project.disk_path
......
...@@ -30,8 +30,6 @@ module Geo ...@@ -30,8 +30,6 @@ module Geo
private private
def move_repositories! def move_repositories!
project.ensure_storage_path_exists
unless move_project_repository unless move_project_repository
log_error('Repository cannot be moved') log_error('Repository cannot be moved')
return false return false
......
...@@ -80,7 +80,6 @@ module Backup ...@@ -80,7 +80,6 @@ module Backup
Project.find_each(batch_size: 1000) do |project| Project.find_each(batch_size: 1000) do |project|
progress.print " * #{project.full_path} ... " progress.print " * #{project.full_path} ... "
path_to_project_bundle = path_to_bundle(project) path_to_project_bundle = path_to_bundle(project)
project.ensure_storage_path_exists
restore_repo_success = nil restore_repo_success = nil
if File.exist?(path_to_project_bundle) if File.exist?(path_to_project_bundle)
......
...@@ -91,7 +91,6 @@ describe Projects::HashedStorage::MigrateRepositoryService do ...@@ -91,7 +91,6 @@ describe Projects::HashedStorage::MigrateRepositoryService do
context 'when rollback fails' do context 'when rollback fails' do
before do before do
hashed_storage.ensure_storage_path_exists
gitlab_shell.mv_repository(project.repository_storage, old_disk_path, new_disk_path) gitlab_shell.mv_repository(project.repository_storage, old_disk_path, new_disk_path)
end end
......
...@@ -91,7 +91,6 @@ describe Projects::HashedStorage::RollbackRepositoryService, :clean_gitlab_redis ...@@ -91,7 +91,6 @@ describe Projects::HashedStorage::RollbackRepositoryService, :clean_gitlab_redis
context 'when rollback fails' do context 'when rollback fails' do
before do before do
legacy_storage.ensure_storage_path_exists
gitlab_shell.mv_repository(project.repository_storage, old_disk_path, new_disk_path) gitlab_shell.mv_repository(project.repository_storage, old_disk_path, new_disk_path)
end end
......
...@@ -9,7 +9,6 @@ describe NamespacelessProjectDestroyWorker do ...@@ -9,7 +9,6 @@ describe NamespacelessProjectDestroyWorker do
before do before do
# Stub after_save callbacks that will fail when Project has no namespace # Stub after_save callbacks that will fail when Project has no namespace
allow_any_instance_of(Project).to receive(:ensure_storage_path_exists).and_return(nil)
allow_any_instance_of(Project).to receive(:update_project_statistics).and_return(nil) allow_any_instance_of(Project).to receive(:update_project_statistics).and_return(nil)
end end
......
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