update statement_retrier.rb to setup step to increment

Author: CharlesDelannoy

lib/safe-pg-migrations/configuration.rb

@@ -33,7 +33,7 @@ def initialize
     def lock_timeout=(value)
       raise 'Setting lock timeout to 0 disables the lock timeout and is dangerous' if value == 0.seconds
 
-      unless value.nil? || (value < safe_timeout && value < max_lock_timeout_on_retry)
+      unless value.nil? || (value < safe_timeout && value < max_lock_timeout_for_retry)
         raise ArgumentError, "Lock timeout (#{value}) cannot be greater than the safe timeout (#{safe_timeout}) or the max lock timeout for retry (#{max_lock_timeout_for_retry})"
       end
 

lib/safe-pg-migrations/plugins/statement_retrier.rb

@@ -13,21 +13,16 @@ module StatementRetrier
     private
 
     def retry_if_lock_timeout
+      lock_timeout_step = get_lock_timeout_step(SafePgMigrations.config)
       number_of_retries = 0
       begin
         number_of_retries += 1
         yield
       rescue ActiveRecord::LockWaitTimeout
         raise if transaction_open? # Retrying is useless if we're inside a transaction.
-        raise if number_of_retries >= SafePgMigrations.config.max_tries
+        raise if number_of_retries >= max_tries
 
-        unless SafePgMigrations.config.lock_timeout.nil?
-          if SafePgMigrations.config.lock_timeout < SafePgMigrations.config.max_lock_timeout
-            SafePgMigrations.config.lock_timeout = SafePgMigrations.config.lock_timeout * number_of_retries
-          else
-            SafePgMigrations.config.lock_timeout = SafePgMigrations.config.max_lock_timeout
-          end
-        end
+        increase_lock_timeout(lock_timeout_step) unless SafePgMigrations.config.lock_timeout.nil?
 
         retry_delay = SafePgMigrations.config.retry_delay
         Helpers::Logger.say "Retrying in #{retry_delay} seconds...", sub_item: true
@@ -36,5 +31,16 @@ def retry_if_lock_timeout
         retry
       end
     end
+
+    def increase_lock_timeout(lock_timeout_step)
+      SafePgMigrations.config.lock_timeout += lock_timeout_step
+      unless SafePgMigrations.config.lock_timeout < SafePgMigrations.config.max_lock_timeout_for_retry
+        SafePgMigrations.config.lock_timeout = SafePgMigrations.config.max_lock_timeout_for_retry
+      end
+    end
+
+    def get_lock_timeout_step(config)
+      (config.max_lock_timeout_for_retry - config.lock_timeout) / config.max_tries
+    end
   end
 end