Commit 249cf56d authored by Andreas Brandl's avatar Andreas Brandl

Merge branch '328816-pause-ms-attribute' into 'master'

Ensure BacthedMigration and BatchedJob always have pause_ms attribute

See merge request gitlab-org/gitlab!60342
parents 3877ea35 24c2db2d
...@@ -17,6 +17,8 @@ module Gitlab ...@@ -17,6 +17,8 @@ module Gitlab
delegate :aborted?, :job_class, :table_name, :column_name, :job_arguments, delegate :aborted?, :job_class, :table_name, :column_name, :job_arguments,
to: :batched_migration, prefix: :migration to: :batched_migration, prefix: :migration
attribute :pause_ms, :integer, default: 100
end end
end end
end end
......
...@@ -23,6 +23,8 @@ module Gitlab ...@@ -23,6 +23,8 @@ module Gitlab
finished: 3 finished: 3
} }
attribute :pause_ms, :integer, default: 100
def self.active_migration def self.active_migration
active.queue_order.first active.queue_order.first
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment