Improve pipeline optimistic locking implementation
This commit is contained in:
parent
7db9323de7
commit
83059f130e
|
|
@ -5,6 +5,7 @@ module Ci
|
|||
include Importable
|
||||
include AfterCommitQueue
|
||||
include Presentable
|
||||
include Gitlab::OptimisticLocking
|
||||
|
||||
belongs_to :project
|
||||
belongs_to :user
|
||||
|
|
@ -274,7 +275,7 @@ module Ci
|
|||
end
|
||||
|
||||
def cancel_running
|
||||
Gitlab::OptimisticLocking.retry_lock(cancelable_statuses) do |cancelable|
|
||||
retry_optimistic_lock(cancelable_statuses) do |cancelable|
|
||||
cancelable.find_each do |job|
|
||||
yield(job) if block_given?
|
||||
job.cancel
|
||||
|
|
@ -418,7 +419,7 @@ module Ci
|
|||
end
|
||||
|
||||
def update_status
|
||||
Gitlab::OptimisticLocking.retry_lock(self) do
|
||||
retry_optimistic_lock(self) do
|
||||
case latest_builds_status
|
||||
when 'pending' then enqueue
|
||||
when 'running' then run
|
||||
|
|
|
|||
Loading…
Reference in New Issue