diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb')
-rw-r--r-- | lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb b/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb index 4cf540ce3b8..c1dc616cbb2 100644 --- a/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb +++ b/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb @@ -133,11 +133,7 @@ module Gitlab end def idempotency_string - # TODO: dump the argument's JSON using `Sidekiq.dump_json` instead - # this should be done in the next release so all jobs are written - # with their idempotency key. - # see https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1090 - "#{worker_class_name}:#{arguments.join('-')}" + "#{worker_class_name}:#{Sidekiq.dump_json(arguments)}" end end end |