Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb')
-rw-r--r--lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb18
1 files changed, 7 insertions, 11 deletions
diff --git a/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb b/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb
index 5efd1b34d32..79ac853ea0c 100644
--- a/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb
+++ b/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb
@@ -70,10 +70,6 @@ module Gitlab
jid != existing_jid
end
- def droppable?
- idempotent? && ::Feature.disabled?("disable_#{queue_name}_deduplication", type: :ops)
- end
-
def scheduled_at
job['at']
end
@@ -85,6 +81,13 @@ module Gitlab
worker_klass.get_deduplication_options
end
+ def idempotent?
+ return false unless worker_klass
+ return false unless worker_klass.respond_to?(:idempotent?)
+
+ worker_klass.idempotent?
+ end
+
private
attr_reader :queue_name, :job
@@ -128,13 +131,6 @@ module Gitlab
def idempotency_string
"#{worker_class_name}:#{arguments.join('-')}"
end
-
- def idempotent?
- return false unless worker_klass
- return false unless worker_klass.respond_to?(:idempotent?)
-
- worker_klass.idempotent?
- end
end
end
end