Commit ae86fd96 authored by Imre Farkas's avatar Imre Farkas

Cancel ExclusiveLease upon completion in ProjectCacheWorker

parent 3a3233a5
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# Worker for updating any project specific caches. # Worker for updating any project specific caches.
class ProjectCacheWorker class ProjectCacheWorker
include ApplicationWorker include ApplicationWorker
include ExclusiveLeaseGuard
LEASE_TIMEOUT = 15.minutes.to_i LEASE_TIMEOUT = 15.minutes.to_i
...@@ -13,30 +14,30 @@ class ProjectCacheWorker ...@@ -13,30 +14,30 @@ class ProjectCacheWorker
# statistics - An Array containing columns from ProjectStatistics to # statistics - An Array containing columns from ProjectStatistics to
# refresh, if empty all columns will be refreshed # refresh, if empty all columns will be refreshed
def perform(project_id, files = [], statistics = []) def perform(project_id, files = [], statistics = [])
project = Project.find_by(id: project_id) @project = Project.find_by(id: project_id)
return unless @project&.repository&.exists?
return unless project && project.repository.exists? update_statistics(statistics)
update_statistics(project, statistics.map(&:to_sym)) @project.repository.refresh_method_caches(files.map(&:to_sym))
project.repository.refresh_method_caches(files.map(&:to_sym)) @project.cleanup
project.cleanup
end end
def update_statistics(project, statistics = []) private
return unless try_obtain_lease_for(project.id, :update_statistics)
Rails.logger.info("Updating statistics for project #{project.id}")
project.statistics.refresh!(only: statistics) def update_statistics(statistics = [])
try_obtain_lease do
Rails.logger.info("Updating statistics for project #{@project.id}")
@project.statistics.refresh!(only: statistics.to_a.map(&:to_sym))
end
end end
private def lease_timeout
LEASE_TIMEOUT
end
def try_obtain_lease_for(project_id, section) def lease_key
Gitlab::ExclusiveLease "project_cache_worker:#{@project.id}:update_statistics"
.new("project_cache_worker:#{project_id}:#{section}", timeout: LEASE_TIMEOUT)
.try_obtain
end end
end end
---
title: Cancel ExclusiveLease upon completion in ProjectCacheWorker
merge_request: 20103
author:
type: fixed
...@@ -9,44 +9,50 @@ describe ProjectCacheWorker do ...@@ -9,44 +9,50 @@ describe ProjectCacheWorker do
let(:lease_key) { "project_cache_worker:#{project.id}:update_statistics" } let(:lease_key) { "project_cache_worker:#{project.id}:update_statistics" }
let(:lease_timeout) { ProjectCacheWorker::LEASE_TIMEOUT } let(:lease_timeout) { ProjectCacheWorker::LEASE_TIMEOUT }
describe '#perform' do before do
before do stub_exclusive_lease(lease_key, timeout: lease_timeout)
stub_exclusive_lease(lease_key, timeout: lease_timeout)
end allow(Project).to receive(:find_by)
.with(id: project.id)
.and_return(project)
end
describe '#perform' do
context 'with a non-existing project' do context 'with a non-existing project' do
it 'does nothing' do it 'does not update statistic' do
expect(worker).not_to receive(:update_statistics) allow(Project).to receive(:find_by).with(id: -1).and_return(nil)
expect(subject).not_to receive(:update_statistics)
worker.perform(-1) subject.perform(-1)
end end
end end
context 'with an existing project without a repository' do context 'with an existing project without a repository' do
it 'does nothing' do it 'does not update statistics' do
allow_any_instance_of(Repository).to receive(:exists?).and_return(false) allow(project.repository).to receive(:exists?).and_return(false)
expect(worker).not_to receive(:update_statistics) expect(subject).not_to receive(:update_statistics)
worker.perform(project.id) subject.perform(project.id)
end end
end end
context 'with an existing project' do context 'with an existing project' do
it 'updates the project statistics' do it 'updates the project statistics' do
expect(worker).to receive(:update_statistics) expect(subject).to receive(:update_statistics)
.with(kind_of(Project), %i(repository_size)) .with(%w(repository_size))
.and_call_original .and_call_original
worker.perform(project.id, [], %w(repository_size)) subject.perform(project.id, [], %w(repository_size))
end end
it 'refreshes the method caches' do it 'refreshes the method caches' do
expect_any_instance_of(Repository).to receive(:refresh_method_caches) expect(project.repository).to receive(:refresh_method_caches)
.with(%i(readme)) .with(%i(readme))
.and_call_original .and_call_original
worker.perform(project.id, %w(readme)) subject.perform(project.id, %w(readme))
end end
context 'with plain readme' do context 'with plain readme' do
...@@ -54,23 +60,22 @@ describe ProjectCacheWorker do ...@@ -54,23 +60,22 @@ describe ProjectCacheWorker do
allow(MarkupHelper).to receive(:gitlab_markdown?).and_return(false) allow(MarkupHelper).to receive(:gitlab_markdown?).and_return(false)
allow(MarkupHelper).to receive(:plain?).and_return(true) allow(MarkupHelper).to receive(:plain?).and_return(true)
expect_any_instance_of(Repository).to receive(:refresh_method_caches) expect(project.repository).to receive(:refresh_method_caches)
.with(%i(readme)) .with(%i(readme))
.and_call_original .and_call_original
worker.perform(project.id, %w(readme))
subject.perform(project.id, %w(readme))
end end
end end
end end
end
describe '#update_statistics' do
context 'when a lease could not be obtained' do context 'when a lease could not be obtained' do
it 'does not update the repository size' do it 'does not update the repository size' do
stub_exclusive_lease_taken(lease_key, timeout: lease_timeout) stub_exclusive_lease_taken(lease_key, timeout: lease_timeout)
expect(statistics).not_to receive(:refresh!) expect(project.statistics).not_to receive(:refresh!)
worker.update_statistics(project) subject.perform(project.id, [], %w(repository_size))
end end
end end
...@@ -78,11 +83,17 @@ describe ProjectCacheWorker do ...@@ -78,11 +83,17 @@ describe ProjectCacheWorker do
it 'updates the project statistics' do it 'updates the project statistics' do
stub_exclusive_lease(lease_key, timeout: lease_timeout) stub_exclusive_lease(lease_key, timeout: lease_timeout)
expect(statistics).to receive(:refresh!) expect(project.statistics).to receive(:refresh!)
.with(only: %i(repository_size)) .with(only: %i(repository_size))
.and_call_original .and_call_original
subject.perform(project.id, [], %i(repository_size))
end
it 'cancels the lease after statistics has been updated' do
expect(subject).to receive(:release_lease).with('uuid')
worker.update_statistics(project, %i(repository_size)) subject.perform(project.id, [], %i(repository_size))
end end
end end
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