Commit 0736397e authored by Paco Guzman's avatar Paco Guzman

Reset project pushes_since_gc when we enqueue the git gc call

parent 97999fd4
...@@ -75,6 +75,7 @@ v 8.10.0 (unreleased) ...@@ -75,6 +75,7 @@ v 8.10.0 (unreleased)
- Fix 404 redirect after validation fails importing a GitLab project - Fix 404 redirect after validation fails importing a GitLab project
- Added setting to set new users by default as external !4545 (Dravere) - Added setting to set new users by default as external !4545 (Dravere)
- Add min value for project limit field on user's form !3622 (jastkand) - Add min value for project limit field on user's form !3622 (jastkand)
- Reset project pushes_since_gc when we enqueue the git gc call
- Add reminder to not paste private SSH keys !4399 (Ingo Blechschmidt) - Add reminder to not paste private SSH keys !4399 (Ingo Blechschmidt)
- Remove duplicate `description` field in `MergeRequest` entities (Ben Boeckel) - Remove duplicate `description` field in `MergeRequest` entities (Ben Boeckel)
- Style of import project buttons were fixed in the new project page. !5183 (rdemirbay) - Style of import project buttons were fixed in the new project page. !5183 (rdemirbay)
......
...@@ -22,11 +22,7 @@ module Projects ...@@ -22,11 +22,7 @@ module Projects
def execute def execute
raise LeaseTaken unless try_obtain_lease raise LeaseTaken unless try_obtain_lease
GitGarbageCollectWorker.perform_async(@project.id) execute_gitlab_shell_gc
ensure
Gitlab::Metrics.measure(:reset_pushes_since_gc) do
update_pushes_since_gc(0)
end
end end
def needed? def needed?
...@@ -34,19 +30,27 @@ module Projects ...@@ -34,19 +30,27 @@ module Projects
end end
def increment! def increment!
Gitlab::Metrics.measure(:increment_pushes_since_gc) do if Gitlab::ExclusiveLease.new("project_housekeeping:increment!:#{@project.id}", timeout: 60).try_obtain
update_pushes_since_gc(@project.pushes_since_gc + 1) Gitlab::Metrics.measure(:increment_pushes_since_gc) do
update_pushes_since_gc(@project.pushes_since_gc + 1)
end
end end
end end
private private
def update_pushes_since_gc(new_value) def execute_gitlab_shell_gc
if Gitlab::ExclusiveLease.new("project_housekeeping:update_pushes_since_gc:#{project.id}", timeout: 60).try_obtain GitGarbageCollectWorker.perform_async(@project.id)
@project.update_column(:pushes_since_gc, new_value) ensure
Gitlab::Metrics.measure(:reset_pushes_since_gc) do
update_pushes_since_gc(0)
end end
end end
def update_pushes_since_gc(new_value)
@project.update_column(:pushes_since_gc, new_value)
end
def try_obtain_lease def try_obtain_lease
Gitlab::Metrics.measure(:obtain_housekeeping_lease) do Gitlab::Metrics.measure(:obtain_housekeeping_lease) do
lease = ::Gitlab::ExclusiveLease.new("project_housekeeping:#{@project.id}", timeout: LEASE_TIMEOUT) lease = ::Gitlab::ExclusiveLease.new("project_housekeeping:#{@project.id}", timeout: LEASE_TIMEOUT)
......
...@@ -15,15 +15,25 @@ describe Projects::HousekeepingService do ...@@ -15,15 +15,25 @@ describe Projects::HousekeepingService do
expect(GitGarbageCollectWorker).to receive(:perform_async).with(project.id) expect(GitGarbageCollectWorker).to receive(:perform_async).with(project.id)
subject.execute subject.execute
expect(project.pushes_since_gc).to eq(0) expect(project.reload.pushes_since_gc).to eq(0)
end end
it 'does not enqueue a job when no lease can be obtained' do context 'when no lease can be obtained' do
expect(subject).to receive(:try_obtain_lease).and_return(false) before(:each) do
expect(GitGarbageCollectWorker).not_to receive(:perform_async) expect(subject).to receive(:try_obtain_lease).and_return(false)
end
expect { subject.execute }.to raise_error(Projects::HousekeepingService::LeaseTaken) it 'does not enqueue a job' do
expect(project.pushes_since_gc).to eq(0) expect(GitGarbageCollectWorker).not_to receive(:perform_async)
expect { subject.execute }.to raise_error(Projects::HousekeepingService::LeaseTaken)
end
it 'does not reset pushes_since_gc' do
expect do
expect { subject.execute }.to raise_error(Projects::HousekeepingService::LeaseTaken)
end.not_to change { project.pushes_since_gc }.from(3)
end
end end
end end
...@@ -39,10 +49,24 @@ describe Projects::HousekeepingService do ...@@ -39,10 +49,24 @@ describe Projects::HousekeepingService do
end end
describe 'increment!' do describe 'increment!' do
let(:lease_key) { "project_housekeeping:increment!:#{project.id}" }
it 'increments the pushes_since_gc counter' do it 'increments the pushes_since_gc counter' do
expect(project.pushes_since_gc).to eq(0) lease = double(:lease, try_obtain: true)
subject.increment! expect(Gitlab::ExclusiveLease).to receive(:new).with(lease_key, anything).and_return(lease)
expect(project.pushes_since_gc).to eq(1)
expect do
subject.increment!
end.to change { project.pushes_since_gc }.from(0).to(1)
end
it 'does not increment when no lease can be obtained' do
lease = double(:lease, try_obtain: false)
expect(Gitlab::ExclusiveLease).to receive(:new).with(lease_key, anything).and_return(lease)
expect do
subject.increment!
end.not_to change { project.pushes_since_gc }
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