diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 06:07:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 06:07:43 +0300 |
| commit | dddde902acfa6acfb11583c61faa67cc7c8d11b6 (patch) | |
| tree | 2e9fdf963c84f82995d62d0c55f91168cff3ec47 /lib/gitlab/sidekiq_middleware | |
| parent | 101c30f4dffc624af3cbe3f12edc2cfee570a5f3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/sidekiq_middleware')
| -rw-r--r-- | lib/gitlab/sidekiq_middleware/duplicate_jobs/client.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab/sidekiq_middleware/duplicate_jobs/client.rb b/lib/gitlab/sidekiq_middleware/duplicate_jobs/client.rb index bb0c18735bb..ddd1b91410b 100644 --- a/lib/gitlab/sidekiq_middleware/duplicate_jobs/client.rb +++ b/lib/gitlab/sidekiq_middleware/duplicate_jobs/client.rb @@ -5,6 +5,9 @@ module Gitlab module DuplicateJobs class Client def call(worker_class, job, queue, _redis_pool, &block) + # We don't try to deduplicate jobs that are scheduled in the future + return yield if job['at'] + DuplicateJob.new(job, queue).schedule(&block) end end |