Commit e1fff018 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Clear archive cache asynchronously

parent dad30ec0
...@@ -67,6 +67,7 @@ v 8.1.0 (unreleased) ...@@ -67,6 +67,7 @@ v 8.1.0 (unreleased)
- Only render 404 page from /public - Only render 404 page from /public
- Hide passwords from services API (Alex Lossent) - Hide passwords from services API (Alex Lossent)
- Fix: Images cannot show when projects' path was changed - Fix: Images cannot show when projects' path was changed
- Let gitlab-git-http-server generate and serve 'git archive' downloads
v 8.0.4 v 8.0.4
- Fix Message-ID header to be RFC 2111-compliant to prevent e-mails being dropped (Stan Hu) - Fix Message-ID header to be RFC 2111-compliant to prevent e-mails being dropped (Stan Hu)
......
...@@ -8,6 +8,14 @@ class Repository ...@@ -8,6 +8,14 @@ class Repository
attr_accessor :raw_repository, :path_with_namespace, :project attr_accessor :raw_repository, :path_with_namespace, :project
def self.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
def initialize(path_with_namespace, default_branch = nil, project = nil) def initialize(path_with_namespace, default_branch = nil, project = nil)
@path_with_namespace = path_with_namespace @path_with_namespace = path_with_namespace
@project = project @project = project
...@@ -269,14 +277,6 @@ class Repository ...@@ -269,14 +277,6 @@ class Repository
end end
# Remove archives older than 2 hours # 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
def branches_sorted_by(value) def branches_sorted_by(value)
case value case value
when 'recently_updated' when 'recently_updated'
......
...@@ -7,7 +7,7 @@ class ArchiveRepositoryService ...@@ -7,7 +7,7 @@ class ArchiveRepositoryService
end end
def execute(options = {}) def execute(options = {})
project.repository.clean_old_archives RepositoryArchiveCacheWorker.perform_async
metadata = project.repository.archive_metadata(ref, storage_path, format) metadata = project.repository.archive_metadata(ref, storage_path, format)
raise "Repository or ref not found" if metadata.empty? raise "Repository or ref not found" if metadata.empty?
......
class RepositoryArchiveCacheWorker
include Sidekiq::Worker
sidekiq_options queue: :default
def perform
Repository.clean_old_archives
end
end
...@@ -6,7 +6,7 @@ describe ArchiveRepositoryService do ...@@ -6,7 +6,7 @@ describe ArchiveRepositoryService do
describe "#execute" do describe "#execute" do
it "cleans old archives" do it "cleans old archives" do
expect(project.repository).to receive(:clean_old_archives) expect(RepositoryArchiveCacheWorker).to receive(:perform_async)
subject.execute(timeout: 0.0) subject.execute(timeout: 0.0)
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