diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-10-03 10:12:28 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-10-05 11:50:12 +0200 |
| commit | 83059f130e9049939e3e8251b7ede5fa128073fd (patch) | |
| tree | 8f7a20e36196f49a79cb3eb6fb672d90882e1dd4 | |
| parent | 7db9323de7091b75c3c19b871f3632ed870f9b35 (diff) | |
| download | gitlab-ce-backstage/gb/move-some-pipelines-code-from-ee-to-ee.tar.gz | |
Improve pipeline optimistic locking implementationbackstage/gb/move-some-pipelines-code-from-ee-to-ee
| -rw-r--r-- | app/models/ci/pipeline.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 728ce1d9cc6..cf3ce3c9e54 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -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 |