From 35c9eaced5ac35f942cab44d92ed39f3cfa2f8dd Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 17 Jun 2020 00:16:40 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/workers/concerns/worker_attributes.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'app/workers/concerns') diff --git a/app/workers/concerns/worker_attributes.rb b/app/workers/concerns/worker_attributes.rb index 7fa56c25210..b19217b15de 100644 --- a/app/workers/concerns/worker_attributes.rb +++ b/app/workers/concerns/worker_attributes.rb @@ -119,6 +119,20 @@ module WorkerAttributes Array(worker_attributes[:tags]) end + def deduplicate(strategy, options = {}) + worker_attributes[:deduplication_strategy] = strategy + worker_attributes[:deduplication_options] = options + end + + def get_deduplicate_strategy + worker_attributes[:deduplication_strategy] || + Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob::DEFAULT_STRATEGY + end + + def get_deduplication_options + worker_attributes[:deduplication_options] || {} + end + protected # Returns a worker attribute declared on this class or its parent class. -- cgit v1.2.1