use pg_duration to avoid errors

Author: CharlesDelannoy

lib/safe-pg-migrations/configuration.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/numeric/time'
+require 'safe-pg-migrations/helpers/pg_helper'
 
 module SafePgMigrations
   class Configuration
+    include Helpers::PgHelper
+
     attr_accessor(*%i[
                     backfill_batch_size
                     backfill_pause
@@ -77,12 +80,5 @@ def pg_lock_timeout
       # By reducing the lock timeout by a very small margin, we ensure that the lock timeout is raised in priority
       pg_duration safe_timeout * 0.99
     end
-
-    private
-
-    def pg_duration(duration)
-      value, unit = duration.integer? ? [duration, 's'] : [(duration * 1000).to_i, 'ms']
-      "#{value}#{unit}"
-    end
   end
 end

lib/safe-pg-migrations/helpers/pg_helper.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module SafePgMigrations
+  module Helpers
+    module PgHelper
+      def pg_duration(duration)
+        value, unit = duration.integer? ? [duration, 's'] : [(duration * 1000).to_i, 'ms']
+        "#{value}#{unit}"
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@
 module SafePgMigrations
   module StatementRetrier
     include Helpers::StatementsHelper
+    include Helpers::PgHelper
 
     RETRIABLE_SCHEMA_STATEMENTS.each do |method|
       define_method method do |*args, **options, &block|
@@ -36,14 +37,14 @@ def retry_if_lock_timeout
     end
 
     def increase_lock_timeout
-      Helpers::Logger.say "  Increasing the lock timeout... Currently set to #{@lock_timeout} seconds",
+      Helpers::Logger.say "  Increasing the lock timeout... Currently set to #{pg_duration(@lock_timeout)}",
                           sub_item: true
       @lock_timeout += lock_timeout_step
       unless @lock_timeout < SafePgMigrations.config.max_lock_timeout_for_retry
         @lock_timeout = SafePgMigrations.config.max_lock_timeout_for_retry
       end
-      execute("SET lock_timeout TO '#{@lock_timeout}s'")
-      Helpers::Logger.say "  Lock timeout is now set to #{@lock_timeout} seconds", sub_item: true
+      execute("SET lock_timeout TO '#{pg_duration(@lock_timeout)}'")
+      Helpers::Logger.say "  Lock timeout is now set to #{pg_duration(@lock_timeout)}", sub_item: true
     end
 
     def lock_timeout_step

test/statement_retrier_test.rb

@@ -12,20 +12,20 @@ def test_lock_timeout_increase_on_retry
 
       assert_equal [
         '   -> Retrying in 60 seconds...',
-        '   ->   Increasing the lock timeout... Currently set to 0.1 seconds',
-        '   ->   Lock timeout is now set to 0.325 seconds',
+        '   ->   Increasing the lock timeout... Currently set to 100ms',
+        '   ->   Lock timeout is now set to 325ms',
         '   -> Retrying now.',
         '   -> Retrying in 60 seconds...',
-        '   ->   Increasing the lock timeout... Currently set to 0.325 seconds',
-        '   ->   Lock timeout is now set to 0.55 seconds',
+        '   ->   Increasing the lock timeout... Currently set to 325ms',
+        '   ->   Lock timeout is now set to 550ms',
         '   -> Retrying now.',
         '   -> Retrying in 60 seconds...',
-        '   ->   Increasing the lock timeout... Currently set to 0.55 seconds',
-        '   ->   Lock timeout is now set to 0.775 seconds',
+        '   ->   Increasing the lock timeout... Currently set to 550ms',
+        '   ->   Lock timeout is now set to 775ms',
         '   -> Retrying now.',
         '   -> Retrying in 60 seconds...',
-        '   ->   Increasing the lock timeout... Currently set to 0.775 seconds',
-        '   ->   Lock timeout is now set to 1 seconds',
+        '   ->   Increasing the lock timeout... Currently set to 775ms',
+        '   ->   Lock timeout is now set to 1s',
         '   -> Retrying now.',
       ], calls[1..].map(&:first)
     end