diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-11 18:08:39 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-11 18:08:39 +0300 |
commit | 4564f677f8d71e814e89618e81709c86cf50e3d2 (patch) | |
tree | 9ba8fffbd8b3ec3d40dc12bfc4132d842f789cfc /app/workers | |
parent | 0b54f87a31c23544ca5917bf772ce9c64a61562c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
-rw-r--r-- | app/workers/pipeline_process_worker.rb | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/app/workers/pipeline_process_worker.rb b/app/workers/pipeline_process_worker.rb index caa2591f1ba..015b89630a1 100644 --- a/app/workers/pipeline_process_worker.rb +++ b/app/workers/pipeline_process_worker.rb @@ -14,7 +14,7 @@ class PipelineProcessWorker loggable_arguments 1 idempotent! - deduplicate :until_executing # Remove when FF `ci_pipeline_process_worker_dedup_until_executed` is removed + deduplicate :until_executed, if_deduplicated: :reschedule_once, ttl: 1.minute def perform(pipeline_id) Ci::Pipeline.find_by_id(pipeline_id).try do |pipeline| @@ -23,14 +23,4 @@ class PipelineProcessWorker .execute end end - - # When FF `ci_pipeline_process_worker_dedup_until_executed` is removed, remove this method and - # add `deduplicate :until_executed, if_deduplicated: :reschedule_once`, ttl: 1.minute to the class - def self.perform_async(pipeline_id) - return super unless Feature.enabled?(:ci_pipeline_process_worker_dedup_until_executed) - - set( - deduplicate: { strategy: :until_executed, options: { if_deduplicated: :reschedule_once, ttl: 1.minute } } - ).perform_async(pipeline_id) - end end |