diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-14 00:07:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-14 00:07:42 +0000 |
| commit | 5225ffb5ccfe2fe0e55a3327d43f28f4ed08ae63 (patch) | |
| tree | ceb6a117475daa1aa17632e1c297863b53195897 /lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb | |
| parent | c0b9c14ebd1524a1e2334e656f997ec680a18966 (diff) | |
| download | gitlab-ce-5225ffb5ccfe2fe0e55a3327d43f28f4ed08ae63.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb')
| -rw-r--r-- | lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb b/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb index bb87104630c..3ed9c1743ed 100644 --- a/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb +++ b/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb @@ -147,7 +147,10 @@ module Gitlab end local cookie = cmsgpack.unpack(cookie_msgpack) cookie.deduplicated = "1" - redis.call("set", KEYS[1], cmsgpack.pack(cookie), "ex", redis.call("ttl", KEYS[1])) + local ttl = redis.call("ttl", KEYS[1]) + if ttl > 0 then + redis.call("set", KEYS[1], cmsgpack.pack(cookie), "ex", ttl) + end LUA def should_reschedule? |