Commit a7976905 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'gitaly-create-repository' into 'master'

Create repositories via Gitaly

Closes gitaly#595

See merge request gitlab-org/gitlab-ce!14566
parents aec1586c e5fecc3a
...@@ -398,7 +398,7 @@ group :ed25519 do ...@@ -398,7 +398,7 @@ group :ed25519 do
end end
# Gitaly GRPC client # Gitaly GRPC client
gem 'gitaly-proto', '~> 0.37.0', require: 'gitaly' gem 'gitaly-proto', '~> 0.38.0', require: 'gitaly'
gem 'toml-rb', '~> 0.3.15', require: false gem 'toml-rb', '~> 0.3.15', require: false
......
...@@ -275,7 +275,7 @@ GEM ...@@ -275,7 +275,7 @@ GEM
po_to_json (>= 1.0.0) po_to_json (>= 1.0.0)
rails (>= 3.2.0) rails (>= 3.2.0)
gherkin-ruby (0.3.2) gherkin-ruby (0.3.2)
gitaly-proto (0.37.0) gitaly-proto (0.38.0)
google-protobuf (~> 3.1) google-protobuf (~> 3.1)
grpc (~> 1.0) grpc (~> 1.0)
github-linguist (4.7.6) github-linguist (4.7.6)
...@@ -1025,7 +1025,7 @@ DEPENDENCIES ...@@ -1025,7 +1025,7 @@ DEPENDENCIES
gettext (~> 3.2.2) gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0) gettext_i18n_rails_js (~> 1.2.0)
gitaly-proto (~> 0.37.0) gitaly-proto (~> 0.38.0)
github-linguist (~> 4.7.0) github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1) gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.6.2) gitlab-markup (~> 1.6.2)
......
...@@ -1035,7 +1035,7 @@ class Project < ActiveRecord::Base ...@@ -1035,7 +1035,7 @@ class Project < ActiveRecord::Base
# Forked import is handled asynchronously # Forked import is handled asynchronously
return if forked? && !force return if forked? && !force
if gitlab_shell.add_repository(repository_storage_path, disk_path) if gitlab_shell.add_repository(repository_storage, disk_path)
repository.after_create repository.after_create
true true
else else
......
...@@ -174,7 +174,7 @@ class ProjectWiki ...@@ -174,7 +174,7 @@ class ProjectWiki
private private
def init_repo(disk_path) def init_repo(disk_path)
gitlab_shell.add_repository(project.repository_storage_path, disk_path) gitlab_shell.add_repository(project.repository_storage, disk_path)
end end
def commit_details(action, message = nil, title = nil) def commit_details(action, message = nil, title = nil)
......
...@@ -23,11 +23,8 @@ module Gitlab ...@@ -23,11 +23,8 @@ module Gitlab
TagExistsError = Class.new(StandardError) TagExistsError = Class.new(StandardError)
class << self class << self
# Unlike `new`, `create` takes the storage path, not the storage name # Unlike `new`, `create` takes the repository path
def create(storage_path, name, bare: true, symlink_hooks_to: nil) def create(repo_path, bare: true, symlink_hooks_to: nil)
repo_path = File.join(storage_path, name)
repo_path += '.git' unless repo_path.end_with?('.git')
FileUtils.mkdir_p(repo_path, mode: 0770) FileUtils.mkdir_p(repo_path, mode: 0770)
# Equivalent to `git --git-path=#{repo_path} init [--bare]` # Equivalent to `git --git-path=#{repo_path} init [--bare]`
......
...@@ -53,6 +53,11 @@ module Gitlab ...@@ -53,6 +53,11 @@ module Gitlab
GitalyClient.call(@storage, :repository_service, :fetch_remote, request) GitalyClient.call(@storage, :repository_service, :fetch_remote, request)
end end
def create_repository
request = Gitaly::CreateRepositoryRequest.new(repository: @gitaly_repo)
GitalyClient.call(@storage, :repository_service, :create_repository, request)
end
end end
end end
end end
...@@ -65,7 +65,7 @@ module Gitlab ...@@ -65,7 +65,7 @@ module Gitlab
# Init new repository # Init new repository
# #
# storage - project's storage path # storage - project's storage name
# name - project path with namespace # name - project path with namespace
# #
# Ex. # Ex.
...@@ -73,7 +73,19 @@ module Gitlab ...@@ -73,7 +73,19 @@ module Gitlab
# #
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/387 # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/387
def add_repository(storage, name) def add_repository(storage, name)
Gitlab::Git::Repository.create(storage, name, bare: true, symlink_hooks_to: gitlab_shell_hooks_path) relative_path = name.dup
relative_path << '.git' unless relative_path.end_with?('.git')
gitaly_migrate(:create_repository) do |is_enabled|
if is_enabled
repository = Gitlab::Git::Repository.new(storage, relative_path, '')
repository.gitaly_repository_client.create_repository
true
else
repo_path = File.join(Gitlab.config.repositories.storages[storage]['path'], relative_path)
Gitlab::Git::Repository.create(repo_path, bare: true, symlink_hooks_to: gitlab_shell_hooks_path)
end
end
rescue => err rescue => err
Rails.logger.error("Failed to add repository #{storage}/#{name}: #{err}") Rails.logger.error("Failed to add repository #{storage}/#{name}: #{err}")
false false
......
...@@ -79,7 +79,7 @@ namespace :gitlab do ...@@ -79,7 +79,7 @@ namespace :gitlab do
if File.exist?(path_to_repo) if File.exist?(path_to_repo)
print '-' print '-'
else else
if Gitlab::Shell.new.add_repository(project.repository_storage_path, if Gitlab::Shell.new.add_repository(project.repository_storage,
project.disk_path) project.disk_path)
print '.' print '.'
else else
......
...@@ -126,30 +126,42 @@ describe Gitlab::Shell do ...@@ -126,30 +126,42 @@ describe Gitlab::Shell do
end end
describe '#add_repository' do describe '#add_repository' do
it 'creates a repository' do shared_examples '#add_repository' do
created_path = File.join(TestEnv.repos_path, 'project', 'path.git') let(:repository_storage) { 'default' }
hooks_path = File.join(created_path, 'hooks') let(:repository_storage_path) { Gitlab.config.repositories.storages[repository_storage]['path'] }
let(:repo_name) { 'project/path' }
let(:created_path) { File.join(repository_storage_path, repo_name + '.git') }
begin after do
result = gitlab_shell.add_repository(TestEnv.repos_path, 'project/path')
repo_stat = File.stat(created_path) rescue nil
hooks_stat = File.lstat(hooks_path) rescue nil
hooks_dir = File.realpath(hooks_path)
ensure
FileUtils.rm_rf(created_path) FileUtils.rm_rf(created_path)
end end
expect(result).to be_truthy it 'creates a repository' do
expect(repo_stat.mode & 0o777).to eq(0o770) expect(gitlab_shell.add_repository(repository_storage, repo_name)).to be_truthy
expect(hooks_stat.symlink?).to be_truthy
expect(hooks_dir).to eq(gitlab_shell_hooks_path) expect(File.stat(created_path).mode & 0o777).to eq(0o770)
hooks_path = File.join(created_path, 'hooks')
expect(File.lstat(hooks_path)).to be_symlink
expect(File.realpath(hooks_path)).to eq(gitlab_shell_hooks_path)
end end
it 'returns false when the command fails' do it 'returns false when the command fails' do
expect(FileUtils).to receive(:mkdir_p).and_raise(Errno::EEXIST) FileUtils.mkdir_p(File.dirname(created_path))
# This file will block the creation of the repo's .git directory. That
# should cause #add_repository to fail.
FileUtils.touch(created_path)
expect(gitlab_shell.add_repository(repository_storage, repo_name)).to be_falsy
end
end
context 'with gitlay' do
it_behaves_like '#add_repository'
end
expect(gitlab_shell.add_repository('current/storage', 'project/path')).to be_falsy context 'without gitaly', skip_gitaly_mock: true do
it_behaves_like '#add_repository'
end end
end end
......
...@@ -214,15 +214,12 @@ describe Gitlab::Workhorse do ...@@ -214,15 +214,12 @@ describe Gitlab::Workhorse do
end end
it 'includes a Repository param' do it 'includes a Repository param' do
repo_param = { Repository: { repo_param = {
storage_name: 'default', storage_name: 'default',
relative_path: project.full_path + '.git', relative_path: project.full_path + '.git'
git_object_directory: '', }
git_alternate_object_directories: [],
gl_repository: ''
} }
expect(subject).to include(repo_param) expect(subject[:Repository]).to include(repo_param)
end end
context "when git_upload_pack action is passed" do context "when git_upload_pack action is passed" do
......
...@@ -1303,7 +1303,7 @@ describe Project do ...@@ -1303,7 +1303,7 @@ describe Project do
context 'using a regular repository' do context 'using a regular repository' do
it 'creates the repository' do it 'creates the repository' do
expect(shell).to receive(:add_repository) expect(shell).to receive(:add_repository)
.with(project.repository_storage_path, project.disk_path) .with(project.repository_storage, project.disk_path)
.and_return(true) .and_return(true)
expect(project.repository).to receive(:after_create) expect(project.repository).to receive(:after_create)
...@@ -1313,7 +1313,7 @@ describe Project do ...@@ -1313,7 +1313,7 @@ describe Project do
it 'adds an error if the repository could not be created' do it 'adds an error if the repository could not be created' do
expect(shell).to receive(:add_repository) expect(shell).to receive(:add_repository)
.with(project.repository_storage_path, project.disk_path) .with(project.repository_storage, project.disk_path)
.and_return(false) .and_return(false)
expect(project.repository).not_to receive(:after_create) expect(project.repository).not_to receive(:after_create)
...@@ -1370,7 +1370,7 @@ describe Project do ...@@ -1370,7 +1370,7 @@ describe Project do
.and_return(false) .and_return(false)
expect(shell).to receive(:add_repository) expect(shell).to receive(:add_repository)
.with(project.repository_storage_path, project.disk_path) .with(project.repository_storage, project.disk_path)
.and_return(true) .and_return(true)
project.ensure_repository project.ensure_repository
......
...@@ -156,10 +156,11 @@ describe Projects::CreateService, '#execute' do ...@@ -156,10 +156,11 @@ describe Projects::CreateService, '#execute' do
} }
end end
let(:repository_storage_path) { Gitlab.config.repositories.storages['default']['path'] } let(:repository_storage) { 'default' }
let(:repository_storage_path) { Gitlab.config.repositories.storages[repository_storage]['path'] }
before do before do
gitlab_shell.add_repository(repository_storage_path, "#{user.namespace.full_path}/existing") gitlab_shell.add_repository(repository_storage, "#{user.namespace.full_path}/existing")
end end
after do after do
......
...@@ -76,10 +76,11 @@ describe Projects::ForkService do ...@@ -76,10 +76,11 @@ describe Projects::ForkService do
end end
context 'repository already exists' do context 'repository already exists' do
let(:repository_storage_path) { Gitlab.config.repositories.storages['default']['path'] } let(:repository_storage) { 'default' }
let(:repository_storage_path) { Gitlab.config.repositories.storages[repository_storage]['path'] }
before do before do
gitlab_shell.add_repository(repository_storage_path, "#{@to_user.namespace.full_path}/#{@from_project.path}") gitlab_shell.add_repository(repository_storage, "#{@to_user.namespace.full_path}/#{@from_project.path}")
end end
after do after do
......
...@@ -121,11 +121,14 @@ describe Projects::TransferService do ...@@ -121,11 +121,14 @@ describe Projects::TransferService do
end end
context 'namespace which contains orphan repository with same projects path name' do context 'namespace which contains orphan repository with same projects path name' do
let(:repository_storage_path) { Gitlab.config.repositories.storages['default']['path'] } let(:repository_storage) { 'default' }
let(:repository_storage_path) { Gitlab.config.repositories.storages[repository_storage]['path'] }
before do before do
group.add_owner(user) group.add_owner(user)
gitlab_shell.add_repository(repository_storage_path, "#{group.full_path}/#{project.path}") unless gitlab_shell.add_repository(repository_storage, "#{group.full_path}/#{project.path}")
raise 'failed to add repository'
end
@result = transfer_project(project, user, group) @result = transfer_project(project, user, group)
end end
......
...@@ -149,10 +149,11 @@ describe Projects::UpdateService, '#execute' do ...@@ -149,10 +149,11 @@ describe Projects::UpdateService, '#execute' do
end end
context 'when renaming a project' do context 'when renaming a project' do
let(:repository_storage_path) { Gitlab.config.repositories.storages['default']['path'] } let(:repository_storage) { 'default' }
let(:repository_storage_path) { Gitlab.config.repositories.storages[repository_storage]['path'] }
before do before do
gitlab_shell.add_repository(repository_storage_path, "#{user.namespace.full_path}/existing") gitlab_shell.add_repository(repository_storage, "#{user.namespace.full_path}/existing")
end end
after do after do
......
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