diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-08-17 12:00:31 +0300 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-08-17 15:38:05 +0300 |
| commit | f865b1b459b7c53eb57580246d8e20c4fd45f7fe (patch) | |
| tree | b2a6c92cbc4187ca2ed86859ad280990b2525019 /lib/gitlab/sidekiq_status.rb | |
| parent | 4a2a6d521a260981482ee8e4931ebf06cb4f5b6a (diff) | |
Backports EE mirror stuck handling feature (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2628) to CE
Diffstat (limited to 'lib/gitlab/sidekiq_status.rb')
| -rw-r--r-- | lib/gitlab/sidekiq_status.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/gitlab/sidekiq_status.rb b/lib/gitlab/sidekiq_status.rb index ca8d3271541..a0a2769cf9e 100644 --- a/lib/gitlab/sidekiq_status.rb +++ b/lib/gitlab/sidekiq_status.rb @@ -90,9 +90,14 @@ module Gitlab # # Returns an array of completed JIDs def self.completed_jids(job_ids) - Sidekiq.redis do |redis| - job_ids.reject { |jid| redis.exists(key_for(jid)) } + statuses = job_status(job_ids) + + completed = [] + job_ids.zip(statuses).each do |job_id, status| + completed << job_id unless status end + + completed end def self.key_for(jid) |