diff options
author | Joshua Lambert <joshua@gitlab.com> | 2017-07-18 13:40:51 -0400 |
---|---|---|
committer | Joshua Lambert <joshua@gitlab.com> | 2017-07-18 13:40:51 -0400 |
commit | b64752c2f00222daf682135f810e7e625176b0e2 (patch) | |
tree | 02c7c13cca8a885e62cf163c2b15c32d413dfc00 /lib/gitlab/background_migration.rb | |
parent | 4dff5dbca0a2a0cd365866c1dfe963f47743c07f (diff) | |
parent | 64aec37d02a143b7f564992a4f2ceaecf2c5870f (diff) | |
download | gitlab-ce-b64752c2f00222daf682135f810e7e625176b0e2.tar.gz |
Fix merge conflicts
Diffstat (limited to 'lib/gitlab/background_migration.rb')
-rw-r--r-- | lib/gitlab/background_migration.rb | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/lib/gitlab/background_migration.rb b/lib/gitlab/background_migration.rb index d95ecd7b291..b0741b1fba7 100644 --- a/lib/gitlab/background_migration.rb +++ b/lib/gitlab/background_migration.rb @@ -1,24 +1,45 @@ module Gitlab module BackgroundMigration + def self.queue + @queue ||= BackgroundMigrationWorker.sidekiq_options['queue'] + end + # Begins stealing jobs from the background migrations queue, blocking the # caller until all jobs have been completed. # + # When a migration raises a StandardError is is going to be retries up to + # three times, for example, to recover from a deadlock. + # + # When Exception is being raised, it enqueues the migration again, and + # re-raises the exception. + # # steal_class - The name of the class for which to steal jobs. def self.steal(steal_class) - queue = Sidekiq::Queue - .new(BackgroundMigrationWorker.sidekiq_options['queue']) + enqueued = Sidekiq::Queue.new(self.queue) + scheduled = Sidekiq::ScheduledSet.new - queue.each do |job| - migration_class, migration_args = job.args + [scheduled, enqueued].each do |queue| + queue.each do |job| + migration_class, migration_args = job.args - next unless migration_class == steal_class + next unless job.queue == self.queue + next unless migration_class == steal_class - perform(migration_class, migration_args) + begin + perform(migration_class, migration_args, retries: 3) if job.delete + rescue Exception # rubocop:disable Lint/RescueException + BackgroundMigrationWorker # enqueue this migration again + .perform_async(migration_class, migration_args) - job.delete + raise + end + end end end + ## + # Performs a background migration. + # # class_name - The name of the background migration class as defined in the # Gitlab::BackgroundMigration namespace. # |