Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
5fc87138
Commit
5fc87138
authored
Aug 14, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Speed up project creation by inlining repository creation
parent
4a2a6d52
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
55 additions
and
15 deletions
+55
-15
.gitlab-ci.yml
.gitlab-ci.yml
+0
-1
lib/gitlab/git/repository.rb
lib/gitlab/git/repository.rb
+22
-0
lib/gitlab/shell.rb
lib/gitlab/shell.rb
+9
-3
spec/lib/gitlab/shell_spec.rb
spec/lib/gitlab/shell_spec.rb
+24
-11
No files found.
.gitlab-ci.yml
View file @
5fc87138
...
...
@@ -474,7 +474,6 @@ db:rollback-mysql:
variables
:
SIZE
:
"
1"
SETUP_DB
:
"
false"
RAILS_ENV
:
"
development"
script
:
-
git clone https://gitlab.com/gitlab-org/gitlab-test.git
/home/git/repositories/gitlab-org/gitlab-test.git
...
...
lib/gitlab/git/repository.rb
View file @
5fc87138
...
...
@@ -18,6 +18,28 @@ module Gitlab
InvalidBlobName
=
Class
.
new
(
StandardError
)
InvalidRef
=
Class
.
new
(
StandardError
)
class
<<
self
# Unlike `new`, `create` takes the storage path, not the storage name
def
create
(
storage_path
,
name
,
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
)
# Equivalent to `git --git-path=#{repo_path} init [--bare]`
repo
=
Rugged
::
Repository
.
init_at
(
repo_path
,
bare
)
repo
.
close
if
symlink_hooks_to
.
present?
hooks_path
=
File
.
join
(
repo_path
,
'hooks'
)
FileUtils
.
rm_rf
(
hooks_path
)
FileUtils
.
ln_s
(
symlink_hooks_to
,
hooks_path
)
end
true
end
end
# Full path to repo
attr_reader
:path
...
...
lib/gitlab/shell.rb
View file @
5fc87138
...
...
@@ -73,8 +73,10 @@ module Gitlab
#
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/387
def
add_repository
(
storage
,
name
)
gitlab_shell_fast_execute
([
gitlab_shell_projects_path
,
'add-project'
,
storage
,
"
#{
name
}
.git"
])
Gitlab
::
Git
::
Repository
.
create
(
storage
,
name
,
bare:
true
,
symlink_hooks_to:
gitlab_shell_hooks_path
)
rescue
=>
err
Rails
.
logger
.
error
(
"Failed to add repository
#{
storage
}
/
#{
name
}
:
#{
err
}
"
)
false
end
# Import repository
...
...
@@ -273,7 +275,11 @@ module Gitlab
protected
def
gitlab_shell_path
Gitlab
.
config
.
gitlab_shell
.
path
File
.
expand_path
(
Gitlab
.
config
.
gitlab_shell
.
path
)
end
def
gitlab_shell_hooks_path
File
.
expand_path
(
Gitlab
.
config
.
gitlab_shell
.
hooks_path
)
end
def
gitlab_shell_user_home
...
...
spec/lib/gitlab/shell_spec.rb
View file @
5fc87138
...
...
@@ -94,28 +94,41 @@ describe Gitlab::Shell do
end
describe
'projects commands'
do
let
(
:projects_path
)
{
'tmp/tests/shell-projects-test/bin/gitlab-projects'
}
let
(
:gitlab_shell_path
)
{
File
.
expand_path
(
'tmp/tests/gitlab-shell'
)
}
let
(
:projects_path
)
{
File
.
join
(
gitlab_shell_path
,
'bin/gitlab-projects'
)
}
let
(
:gitlab_shell_hooks_path
)
{
File
.
join
(
gitlab_shell_path
,
'hooks'
)
}
before
do
allow
(
Gitlab
.
config
.
gitlab_shell
).
to
receive
(
:path
).
and_return
(
'tmp/tests/shell-projects-test'
)
allow
(
Gitlab
.
config
.
gitlab_shell
).
to
receive
(
:path
).
and_return
(
gitlab_shell_path
)
allow
(
Gitlab
.
config
.
gitlab_shell
).
to
receive
(
:hooks_path
).
and_return
(
gitlab_shell_hooks_path
)
allow
(
Gitlab
.
config
.
gitlab_shell
).
to
receive
(
:git_timeout
).
and_return
(
800
)
end
describe
'#add_repository'
do
it
'returns true when the command succeeds'
do
expect
(
Gitlab
::
Popen
).
to
receive
(
:popen
)
.
with
([
projects_path
,
'add-project'
,
'current/storage'
,
'project/path.git'
],
nil
,
popen_vars
).
and_return
([
nil
,
0
])
it
'creates a repository'
do
created_path
=
File
.
join
(
TestEnv
.
repos_path
,
'project'
,
'path.git'
)
hooks_path
=
File
.
join
(
created_path
,
'hooks'
)
begin
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
)
end
expect
(
gitlab_shell
.
add_repository
(
'current/storage'
,
'project/path'
)).
to
be
true
expect
(
result
).
to
be_truthy
expect
(
repo_stat
.
mode
&
0
o777
).
to
eq
(
0
o770
)
expect
(
hooks_stat
.
symlink?
).
to
be_truthy
expect
(
hooks_dir
).
to
eq
(
gitlab_shell_hooks_path
)
end
it
'returns false when the command fails'
do
expect
(
Gitlab
::
Popen
).
to
receive
(
:popen
)
.
with
([
projects_path
,
'add-project'
,
'current/storage'
,
'project/path.git'
],
nil
,
popen_vars
).
and_return
([
"error"
,
1
])
expect
(
FileUtils
).
to
receive
(
:mkdir_p
).
and_raise
(
Errno
::
EEXIST
)
expect
(
gitlab_shell
.
add_repository
(
'current/storage'
,
'project/path'
)).
to
be
false
expect
(
gitlab_shell
.
add_repository
(
'current/storage'
,
'project/path'
)).
to
be
_falsy
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment