diff options
author | Gabriel Mazetto <brodock@gmail.com> | 2017-08-07 11:07:42 +0200 |
---|---|---|
committer | Gabriel Mazetto <brodock@gmail.com> | 2017-08-22 06:33:20 +0200 |
commit | e7a060321fed61085c7d70d23e9ea33825d1467f (patch) | |
tree | e59b5fd808c21cd819ae62930839c29a99dc6ef9 /app/models/storage | |
parent | 72250a4ed8978b32c2e12dd05fc6feb8132e4083 (diff) | |
download | gitlab-ce-e7a060321fed61085c7d70d23e9ea33825d1467f.tar.gz |
Moving away from the "extend" based factory to a more traditional one.
Using `extend` dynamically can lead to bad performance as it
invalidates the method's cache.
Diffstat (limited to 'app/models/storage')
-rw-r--r-- | app/models/storage/hashed_project.rb | 77 | ||||
-rw-r--r-- | app/models/storage/legacy_project.rb | 80 |
2 files changed, 157 insertions, 0 deletions
diff --git a/app/models/storage/hashed_project.rb b/app/models/storage/hashed_project.rb new file mode 100644 index 00000000000..364794a4eef --- /dev/null +++ b/app/models/storage/hashed_project.rb @@ -0,0 +1,77 @@ +module Storage + class HashedProject + attr_accessor :project + delegate :namespace, :gitlab_shell, :repository_storage_path, to: :project + + def initialize(project) + @project = project + end + + # Base directory + # + # @return [String] directory where repository is stored + def base_dir + %Q(#{disk_hash[0..1]}/#{disk_hash[2..3]}) if disk_hash + end + + # Disk path is used to build repository and project's wiki path on disk + # + # @return [String] combination of base_dir and the repository own name without `.git` or `.wiki.git` extensions + def disk_path + %Q(#{base_dir}/#{disk_hash}) + end + + def ensure_storage_path_exist + gitlab_shell.add_namespace(repository_storage_path, base_dir) + end + + def rename_repo + # TODO: We cannot wipe most of this method until we provide migration path for Container Registries + path_was = project.previous_changes['path'].first + old_path_with_namespace = File.join(namespace.full_path, path_was) + new_path_with_namespace = File.join(namespace.full_path, project.path) + + Rails.logger.error "Attempting to rename #{old_path_with_namespace} -> #{new_path_with_namespace}" + + if project.has_container_registry_tags? + Rails.logger.error "Project #{old_path_with_namespace} cannot be renamed because container registry tags are present!" + + # we currently doesn't support renaming repository if it contains images in container registry + raise StandardError.new('Project cannot be renamed, because images are present in its container registry') + end + + begin + # TODO: we can avoid cache expiration if cache is based on UUID or just project_id + project.expire_caches_before_rename(old_path_with_namespace) + project.expires_full_path_cache + + project.send_move_instructions(old_path_with_namespace) + + @old_path_with_namespace = old_path_with_namespace + + SystemHooksService.new.execute_hooks_for(project, :rename) + + @repository = nil + rescue => e + Rails.logger.error "Exception renaming #{old_path_with_namespace} -> #{new_path_with_namespace}: #{e}" + # Returning false does not rollback after_* transaction but gives + # us information about failing some of tasks + false + end + + Gitlab::AppLogger.info "Project was renamed: #{old_path_with_namespace} -> #{new_path_with_namespace}" + + # TODO: When we move Uploads and Pages to use UUID we can disable this transfers as well + Gitlab::UploadsTransfer.new.rename_project(path_was, project.path, namespace.full_path) + Gitlab::PagesTransfer.new.rename_project(path_was, project.path, namespace.full_path) + end + + private + + # Generates the hash for the project path and name on disk + # If you need to refer to the repository on disk, use the `#disk_path` + def disk_hash + @disk_hash ||= Digest::SHA2.hexdigest(project.id.to_s) if project.id + end + end +end diff --git a/app/models/storage/legacy_project.rb b/app/models/storage/legacy_project.rb new file mode 100644 index 00000000000..57c340075ba --- /dev/null +++ b/app/models/storage/legacy_project.rb @@ -0,0 +1,80 @@ +module Storage + class LegacyProject + attr_accessor :project + delegate :namespace, :gitlab_shell, :repository_storage_path, to: :project + + def initialize(project) + @project = project + end + + # Base directory + # + # @return [String] directory where repository is stored + def base_dir + namespace.full_path + end + + # Disk path is used to build repository and project's wiki path on disk + # + # @return [String] combination of base_dir and the repository own name without `.git` or `.wiki.git` extensions + def disk_path + project.full_path + end + + def ensure_storage_path_exist + return unless namespace + + gitlab_shell.add_namespace(repository_storage_path, base_dir) + end + + def rename_repo + path_was = project.previous_changes['path'].first + old_path_with_namespace = File.join(base_dir, path_was) + new_path_with_namespace = File.join(base_dir, project.path) + + Rails.logger.error "Attempting to rename #{old_path_with_namespace} -> #{new_path_with_namespace}" + + if project.has_container_registry_tags? + Rails.logger.error "Project #{old_path_with_namespace} cannot be renamed because container registry tags are present!" + + # we currently doesn't support renaming repository if it contains images in container registry + raise StandardError.new('Project cannot be renamed, because images are present in its container registry') + end + + project.expire_caches_before_rename(old_path_with_namespace) + + if gitlab_shell.mv_repository(repository_storage_path, old_path_with_namespace, new_path_with_namespace) + # If repository moved successfully we need to send update instructions to users. + # However we cannot allow rollback since we moved repository + # So we basically we mute exceptions in next actions + begin + gitlab_shell.mv_repository(repository_storage_path, "#{old_path_with_namespace}.wiki", "#{new_path_with_namespace}.wiki") + project.send_move_instructions(old_path_with_namespace) + project.expires_full_path_cache + + @old_path_with_namespace = old_path_with_namespace + + SystemHooksService.new.execute_hooks_for(project, :rename) + + @repository = nil + rescue => e + Rails.logger.error "Exception renaming #{old_path_with_namespace} -> #{new_path_with_namespace}: #{e}" + # Returning false does not rollback after_* transaction but gives + # us information about failing some of tasks + false + end + else + Rails.logger.error "Repository could not be renamed: #{old_path_with_namespace} -> #{new_path_with_namespace}" + + # if we cannot move namespace directory we should rollback + # db changes in order to prevent out of sync between db and fs + raise StandardError.new('repository cannot be renamed') + end + + Gitlab::AppLogger.info "Project was renamed: #{old_path_with_namespace} -> #{new_path_with_namespace}" + + Gitlab::UploadsTransfer.new.rename_project(path_was, project.path, base_dir) + Gitlab::PagesTransfer.new.rename_project(path_was, project.path, base_dir) + end + end +end |