Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 5 deletions

diff --git a/lib/gitlab/database/background_migration/batch_optimizer.rb b/lib/gitlab/database/background_migration/batch_optimizer.rb
index c8fdf8281cd..9eb456f6e2e 100644
--- a/lib/gitlab/database/background_migration/batch_optimizer.rb
+++ b/lib/gitlab/database/background_migration/batch_optimizer.rb
@@ -43,11 +43,14 @@ module Gitlab
         def optimize!
           return unless Feature.enabled?(:optimize_batched_migrations, type: :ops)
 
-          if multiplier = batch_size_multiplier
-            max_batch = migration.max_batch_size || MAX_BATCH_SIZE
-            migration.batch_size = (migration.batch_size * multiplier).to_i.clamp(MIN_BATCH_SIZE, max_batch)
-            migration.save!
-          end
+          multiplier = batch_size_multiplier
+          return if multiplier.nil?
+
+          max_batch = migration.max_batch_size || MAX_BATCH_SIZE
+          min_batch = [max_batch, MIN_BATCH_SIZE].min
+
+          migration.batch_size = (migration.batch_size * multiplier).to_i.clamp(min_batch, max_batch)
+          migration.save!
         end
 
         private