Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 6 deletions

diff --git a/lib/gitlab/background_migration.rb b/lib/gitlab/background_migration.rb
index 22b4b685f81..ed58508182a 100644
--- a/lib/gitlab/background_migration.rb
+++ b/lib/gitlab/background_migration.rb
@@ -2,11 +2,13 @@
 
 module Gitlab
   module BackgroundMigration
+    DEFAULT_TRACKING_DATABASE = Gitlab::Database::MAIN_DATABASE_NAME
+
     def self.coordinator_for_database(database)
-      JobCoordinator.for_database(database)
+      JobCoordinator.for_tracking_database(database)
     end
 
-    def self.queue(database: :main)
+    def self.queue(database: DEFAULT_TRACKING_DATABASE)
       coordinator_for_database(database).queue
     end
 
@@ -22,7 +24,7 @@ module Gitlab
     # steal_class - The name of the class for which to steal jobs.
     # retry_dead_jobs - Flag to control whether jobs in Sidekiq::RetrySet or Sidekiq::DeadSet are retried.
     # database - tracking database this migration executes against
-    def self.steal(steal_class, retry_dead_jobs: false, database: :main, &block)
+    def self.steal(steal_class, retry_dead_jobs: false, database: DEFAULT_TRACKING_DATABASE, &block)
       coordinator_for_database(database).steal(steal_class, retry_dead_jobs: retry_dead_jobs, &block)
     end
 
@@ -35,15 +37,15 @@ module Gitlab
     # arguments - The arguments to pass to the background migration's "perform"
     #             method.
     # database - tracking database this migration executes against
-    def self.perform(class_name, arguments, database: :main)
+    def self.perform(class_name, arguments, database: DEFAULT_TRACKING_DATABASE)
       coordinator_for_database(database).perform(class_name, arguments)
     end
 
-    def self.exists?(migration_class, additional_queues = [], database: :main)
+    def self.exists?(migration_class, additional_queues = [], database: DEFAULT_TRACKING_DATABASE)
       coordinator_for_database(database).exists?(migration_class, additional_queues) # rubocop:disable CodeReuse/ActiveRecord
     end
 
-    def self.remaining(database: :main)
+    def self.remaining(database: DEFAULT_TRACKING_DATABASE)
       coordinator_for_database(database).remaining
     end
   end