diff options
Diffstat (limited to 'lib/gitlab/database/background_migration/batched_migration.rb')
| -rw-r--r-- | lib/gitlab/database/background_migration/batched_migration.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/gitlab/database/background_migration/batched_migration.rb b/lib/gitlab/database/background_migration/batched_migration.rb index 209e281dd8d..61a660ad14c 100644 --- a/lib/gitlab/database/background_migration/batched_migration.rb +++ b/lib/gitlab/database/background_migration/batched_migration.rb @@ -94,8 +94,7 @@ module Gitlab end def self.active_migration(connection:) - for_gitlab_schema(Gitlab::Database.gitlab_schemas_for_connection(connection)) - .executable.queue_order.first + active_migrations_distinct_on_table(connection: connection, limit: 1).first end def self.find_executable(id, connection:) @@ -103,6 +102,15 @@ module Gitlab .executable.find_by_id(id) end + def self.active_migrations_distinct_on_table(connection:, limit:) + distinct_on_table = select('DISTINCT ON (table_name) id') + .for_gitlab_schema(Gitlab::Database.gitlab_schemas_for_connection(connection)) + .executable + .order(table_name: :asc, id: :asc) + + where(id: distinct_on_table).queue_order.limit(limit) + end + def self.successful_rows_counts(migrations) BatchedJob .with_status(:succeeded) |