Merge branch 'no-gc-retry' into 'master'
Do not retry "git gc" To prevent 'git gc' timing out on a large repo and then bouncing around in the retry queue. See merge request !3266
This commit is contained in:
commit
c790107854
|
@ -24,7 +24,7 @@ module Projects
|
||||||
def execute
|
def execute
|
||||||
raise LeaseTaken if !try_obtain_lease
|
raise LeaseTaken if !try_obtain_lease
|
||||||
|
|
||||||
GitlabShellWorker.perform_async(:gc, @project.path_with_namespace)
|
GitlabShellOneShotWorker.perform_async(:gc, @project.path_with_namespace)
|
||||||
ensure
|
ensure
|
||||||
@project.update_column(:pushes_since_gc, 0)
|
@project.update_column(:pushes_since_gc, 0)
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
class GitlabShellOneShotWorker
|
||||||
|
include Sidekiq::Worker
|
||||||
|
include Gitlab::ShellAdapter
|
||||||
|
|
||||||
|
sidekiq_options queue: :gitlab_shell, retry: false
|
||||||
|
|
||||||
|
def perform(action, *arg)
|
||||||
|
gitlab_shell.send(action, *arg)
|
||||||
|
end
|
||||||
|
end
|
|
@ -12,7 +12,7 @@ describe Projects::HousekeepingService do
|
||||||
|
|
||||||
it 'enqueues a sidekiq job' do
|
it 'enqueues a sidekiq job' do
|
||||||
expect(subject).to receive(:try_obtain_lease).and_return(true)
|
expect(subject).to receive(:try_obtain_lease).and_return(true)
|
||||||
expect(GitlabShellWorker).to receive(:perform_async).with(:gc, project.path_with_namespace)
|
expect(GitlabShellOneShotWorker).to receive(:perform_async).with(:gc, project.path_with_namespace)
|
||||||
|
|
||||||
subject.execute
|
subject.execute
|
||||||
expect(project.pushes_since_gc).to eq(0)
|
expect(project.pushes_since_gc).to eq(0)
|
||||||
|
@ -20,7 +20,7 @@ describe Projects::HousekeepingService do
|
||||||
|
|
||||||
it 'does not enqueue a job when no lease can be obtained' do
|
it 'does not enqueue a job when no lease can be obtained' do
|
||||||
expect(subject).to receive(:try_obtain_lease).and_return(false)
|
expect(subject).to receive(:try_obtain_lease).and_return(false)
|
||||||
expect(GitlabShellWorker).not_to receive(:perform_async)
|
expect(GitlabShellOneShotWorker).not_to receive(:perform_async)
|
||||||
|
|
||||||
expect { subject.execute }.to raise_error(Projects::HousekeepingService::LeaseTaken)
|
expect { subject.execute }.to raise_error(Projects::HousekeepingService::LeaseTaken)
|
||||||
expect(project.pushes_since_gc).to eq(0)
|
expect(project.pushes_since_gc).to eq(0)
|
||||||
|
|
Loading…
Reference in New Issue