diff options
author | Mark Chao <mchao@gitlab.com> | 2019-01-30 17:03:23 +0800 |
---|---|---|
committer | Mark Chao <mchao@gitlab.com> | 2019-02-02 21:45:10 +0800 |
commit | c34f6ea604338820710bd2bff86620b3bf2dce22 (patch) | |
tree | b7482c7c57bb9657681057a085f43fde913990ae /lib/gitlab/background_migration.rb | |
parent | dd26a9addc5dd654e3c8eecb58216f1f4449cfc1 (diff) | |
download | gitlab-ce-c34f6ea604338820710bd2bff86620b3bf2dce22.tar.gz |
Consume remaining MigrateApproverToApprovalRulesInBatch
Allow `steal` to handle dead jobs.
Diffstat (limited to 'lib/gitlab/background_migration.rb')
-rw-r--r-- | lib/gitlab/background_migration.rb | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/gitlab/background_migration.rb b/lib/gitlab/background_migration.rb index 6cf40e2d4ca..5251e0fadf9 100644 --- a/lib/gitlab/background_migration.rb +++ b/lib/gitlab/background_migration.rb @@ -16,11 +16,18 @@ module Gitlab # re-raises the exception. # # steal_class - The name of the class for which to steal jobs. - def self.steal(steal_class) - enqueued = Sidekiq::Queue.new(self.queue) - scheduled = Sidekiq::ScheduledSet.new + def self.steal(steal_class, retry_dead_jobs: false) + queues = [ + Sidekiq::ScheduledSet.new, + Sidekiq::Queue.new(self.queue) + ] + + if retry_dead_jobs + queues << Sidekiq::RetrySet.new + queues << Sidekiq::DeadSet.new + end - [scheduled, enqueued].each do |queue| + queues.each do |queue| queue.each do |job| migration_class, migration_args = job.args |