From e9f83c4bd9d6b596d647f9347d0014b3ab2cca3e Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Tue, 7 Feb 2017 23:08:02 +0100 Subject: Add Gitlab::OptimisticLocking for build dropping --- app/workers/stuck_ci_builds_worker.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/workers/stuck_ci_builds_worker.rb b/app/workers/stuck_ci_builds_worker.rb index 4eba311d063..3b18fe3dd26 100644 --- a/app/workers/stuck_ci_builds_worker.rb +++ b/app/workers/stuck_ci_builds_worker.rb @@ -47,6 +47,8 @@ class StuckCiBuildsWorker def drop_build(type, build, status, timeout) Rails.logger.info "#{self.class}: Dropping #{type} build #{build.id} for runner #{build.runner_id} (status: #{status}, timeout: #{timeout})" - build.drop + Gitlab::OptimisticLocking.retry_lock(build, 3) do |b| + b.drop + end end end -- cgit v1.2.1