1 files changed, 9 insertions, 4 deletions
diff --git a/lib/gitlab/database/schema_helpers.rb b/lib/gitlab/database/schema_helpers.rb
index f96de13006f..2c7ca28942e 100644
--- a/lib/gitlab/database/schema_helpers.rb
+++ b/lib/gitlab/database/schema_helpers.rb
@@ -71,12 +71,17 @@ module Gitlab
         "#{type}_#{hashed_identifier}"
       end
 
-      def with_lock_retries(&block)
-        Gitlab::Database::WithLockRetries.new(
+      def with_lock_retries(*args, **kwargs, &block)
+        raise_on_exhaustion = !!kwargs.delete(:raise_on_exhaustion)
+        merged_args = {
           connection: connection,
           klass: self.class,
-          logger: Gitlab::BackgroundMigration::Logger
-        ).run(&block)
+          logger: Gitlab::BackgroundMigration::Logger,
+          allow_savepoints: true
+        }.merge(kwargs)
+
+        Gitlab::Database::WithLockRetries.new(**merged_args)
+          .run(raise_on_exhaustion: raise_on_exhaustion, &block)
       end
 
       def assert_not_in_transaction_block(scope:)