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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
2cfd0b59
Commit
2cfd0b59
authored
Mar 24, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Archive repositories in background worker.
parent
33a8f53f
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
121 additions
and
16 deletions
+121
-16
Procfile
Procfile
+1
-1
app/controllers/projects/repositories_controller.rb
app/controllers/projects/repositories_controller.rb
+6
-2
app/models/repository.rb
app/models/repository.rb
+3
-0
app/services/archive_repository_service.rb
app/services/archive_repository_service.rb
+59
-8
app/workers/repository_archive_worker.rb
app/workers/repository_archive_worker.rb
+46
-0
lib/api/repositories.rb
lib/api/repositories.rb
+6
-5
No files found.
Procfile
View file @
2cfd0b59
web: bundle exec unicorn_rails -p ${PORT:="3000"} -E ${RAILS_ENV:="development"} -c ${UNICORN_CONFIG:="config/unicorn.rb"}
worker: bundle exec sidekiq -q post_receive -q mailer -q system_hook -q project_web_hook -q gitlab_shell -q common -q default
worker: bundle exec sidekiq -q post_receive -q mailer -q
archive_repo -q
system_hook -q project_web_hook -q gitlab_shell -q common -q default
app/controllers/projects/repositories_controller.rb
View file @
2cfd0b59
...
...
@@ -15,14 +15,18 @@ class Projects::RepositoriesController < Projects::ApplicationController
render_404
and
return
end
file_path
=
ArchiveRepositoryService
.
new
.
execute
(
@project
,
params
[
:ref
],
params
[
:format
])
begin
file_path
=
ArchiveRepositoryService
.
new
(
@project
,
params
[
:ref
],
params
[
:format
]).
execute
rescue
return
render_404
end
if
file_path
# Send file to user
response
.
headers
[
"Content-Length"
]
=
File
.
open
(
file_path
).
size
.
to_s
send_file
file_path
else
re
nder_404
re
direct_to
request
.
fullpath
end
end
end
app/models/repository.rb
View file @
2cfd0b59
...
...
@@ -267,6 +267,9 @@ class Repository
# Remove archives older than 2 hours
def
clean_old_archives
repository_downloads_path
=
Gitlab
.
config
.
gitlab
.
repository_downloads_path
return
unless
File
.
directory?
(
repository_downloads_path
)
Gitlab
::
Popen
.
popen
(
%W(find
#{
repository_downloads_path
}
-not -path
#{
repository_downloads_path
}
-mmin +120 -delete)
)
end
...
...
app/services/archive_repository_service.rb
View file @
2cfd0b59
class
ArchiveRepositoryService
def
execute
(
project
,
ref
,
format
)
storage_path
=
Gitlab
.
config
.
gitlab
.
repository_downloads_path
attr_reader
:project
,
:ref
,
:format
unless
File
.
directory?
(
storage_path
)
FileUtils
.
mkdir_p
(
storage_path
)
def
initialize
(
project
,
ref
,
format
)
format
||=
'tar.gz'
@project
,
@ref
,
@format
=
project
,
ref
,
format
end
format
||=
'tar.gz'
repository
=
project
.
repository
repository
.
clean_old_archives
repository
.
archive_repo
(
ref
,
storage_path
,
format
.
downcase
)
def
execute
project
.
repository
.
clean_old_archives
raise
"No archive file path"
unless
file_path
return
file_path
if
archived?
unless
archiving?
RepositoryArchiveWorker
.
perform_async
(
project
.
id
,
ref
,
format
)
end
archived
=
wait_until_archived
file_path
if
archived
end
private
def
storage_path
Gitlab
.
config
.
gitlab
.
repository_downloads_path
end
def
archive_args
@archive_args
||=
[
ref
,
storage_path
,
format
.
downcase
]
end
def
file_path
@file_path
||=
project
.
repository
.
archive_file_path
(
*
archive_args
)
end
def
pid_file_path
@pid_file_path
||=
project
.
repository
.
archive_pid_file_path
(
*
archive_args
)
end
def
archived?
File
.
exist?
(
file_path
)
end
def
archiving?
File
.
exist?
(
pid_file_path
)
end
def
wait_until_archived
timeout
=
5.0
t1
=
Time
.
now
begin
sleep
0.1
success
=
archived?
t2
=
Time
.
now
end
until
success
||
t2
-
t1
>=
timeout
success
end
end
app/workers/repository_archive_worker.rb
0 → 100644
View file @
2cfd0b59
class
RepositoryArchiveWorker
include
Sidekiq
::
Worker
sidekiq_options
queue: :archive_repo
attr_accessor
:project
,
:ref
,
:format
def
perform
(
project_id
,
ref
,
format
)
@project
=
Project
.
find
(
project_id
)
@ref
,
@format
=
ref
,
format
repository
=
project
.
repository
repository
.
clean_old_archives
return
if
archived?
||
archiving?
repository
.
archive_repo
(
*
archive_args
)
end
private
def
storage_path
Gitlab
.
config
.
gitlab
.
repository_downloads_path
end
def
archive_args
@archive_args
||=
[
ref
,
storage_path
,
format
.
downcase
]
end
def
file_path
@file_path
||=
project
.
repository
.
archive_file_path
(
*
archive_args
)
end
def
pid_file_path
@pid_file_path
||=
project
.
repository
.
archive_pid_file_path
(
*
archive_args
)
end
def
archived?
File
.
exist?
(
file_path
)
end
def
archiving?
File
.
exist?
(
pid_file_path
)
end
end
lib/api/repositories.rb
View file @
2cfd0b59
...
...
@@ -133,10 +133,11 @@ module API
authorize!
:download_code
,
user_project
begin
file_path
=
ArchiveRepositoryService
.
new
.
execute
(
file_path
=
ArchiveRepositoryService
.
new
(
user_project
,
params
[
:sha
],
params
[
:format
])
params
[
:format
]
).
execute
rescue
not_found!
(
'File'
)
end
...
...
@@ -149,7 +150,7 @@ module API
env
[
'api.format'
]
=
:binary
present
data
else
not_found!
(
'File'
)
redirect
request
.
fullpath
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