delayed 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a42f2f7d06ec85c051b3a72e7e8644a750e703e6994cd89e75b151e098810fde
-  data.tar.gz: 122a0e93f5790543eca0484c27f52eff1472f693d1c8eee5c0aef27e1cace575
+  metadata.gz: 16d1a1a8e3f41bee282a4d725afdf3be6419fceba8c5cef58a3eb35a7a406823
+  data.tar.gz: 9ad241b6880c13997ea7b58ba2bcfba02a1beb6692b050698fac30301cc9c90c
 SHA512:
-  metadata.gz: 2238ccb8c25ef5e483faf3a6bfa43f1c72a2b81e2cd5312071d8dbc72ef96397e3b6dceaac61db962028524e9a6b06769005ce64e9a5a1b7b818a81a40554c95
-  data.tar.gz: b255dee5f83ffe62155edaf65e552a3f6042656b60515b7721a0707ff78c2ed8f284d5e298b9448c2ee34cb8d574447619f9e78ec92da5f1dee461f4ebbe4b70
+  metadata.gz: a63a4f0a56f26c9b5bb3a987b6c2877068016823b21efb059744effc0eeb68255b4b193e7f0e0292f6d790e12138ad8c57bab032a7f1f3c1a89e2c533db45df6
+  data.tar.gz: 7912ee6d5d633293a2f1707d890c2fd5a60cbdb1c44ec215a8d2414db35902a272e4caad4ece1947c6475f4e90a7b5c1fe54ef320549681c04c948d7786cd4a8

data/lib/delayed/helpers/migration.rb

@@ -8,6 +8,11 @@ module Delayed
         delegate :concurrent_index_creation_supported?, to: :class
       end
 
+      def exec_migration(...)
+        @migration_start = Delayed::Job.db_time_now
+        super
+      end
+
       module ClassMethods
         def concurrent_index_creation_supported?
           connection.index_algorithms.key?(:concurrently)
@@ -15,13 +20,17 @@ module Delayed
       end
 
       def upsert_index(*args, **opts)
-        dir(:up) { _add_or_replace_index(*args, **opts) }
-        dir(:down) { _drop_index_if_exists(*args, **opts) }
+        with_retry_loop(**opts) do
+          dir(:up) { _add_or_replace_index(*args, **opts) }
+          dir(:down) { _drop_index_if_exists(*args, **opts) }
+        end
       end
 
       def remove_index_if_exists(*args, **opts)
-        dir(:up) { _drop_index_if_exists(*args, **opts) }
-        dir(:down) { _add_or_replace_index(*args, **opts) }
+        with_retry_loop(**opts) do
+          dir(:up) { _drop_index_if_exists(*args, **opts) }
+          dir(:down) { _add_or_replace_index(*args, **opts) }
+        end
       end
 
       RETRY_EXCEPTIONS = [
@@ -43,7 +52,7 @@ module Delayed
         end
       end
 
-      def with_timeouts(statement_timeout: 1.minute, lock_timeout: 5.seconds)
+      def with_timeouts(statement_timeout: 1.minute, lock_timeout: 5.seconds, **_opts)
         dir(:both) { set_timeouts!(statement_timeout: statement_timeout, lock_timeout: lock_timeout) }
         yield
       ensure
@@ -56,24 +65,15 @@ module Delayed
         index = _lookup_index(table, columns, **opts)
         if index && !_index_matches?(index, **opts)
           Delayed.logger.warn("Recreating index #{index.name} (is invalid or does not match desired options)")
-          _drop_index(table, name: index.name, **opts)
+          remove_index(table, name: index.name)
         end
-        _add_index(table, columns, **opts) if !index || !_index_matches?(index, **opts)
+        opts = opts.except(:wait_timeout, :statement_timeout, :lock_timeout)
+        add_index(table, columns, **opts) if !index || !_index_matches?(index, **opts)
       end
 
       def _drop_index_if_exists(table, columns, **opts)
         index = _lookup_index(table, columns, **opts)
-        _drop_index(table, name: index.name, **opts) if index
-      end
-
-      def _add_index(*args, **opts)
-        index_opts = opts.slice!(:wait_timeout, :statement_timeout, :lock_timeout)
-        with_retry_loop(**opts) { add_index(*args, **index_opts) }
-      end
-
-      def _drop_index(table, name:, **opts)
-        opts.slice!(:wait_timeout, :statement_timeout, :lock_timeout)
-        with_retry_loop(**opts) { remove_index(table, name: name) }
+        remove_index(table, name: index.name) if index
       end
 
       def _lookup_index(table, columns, **opts)

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = '2.0.0'
+  VERSION = '2.0.2'
 end

data/spec/delayed/helpers/migration_spec.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require 'helper'
+
+describe Delayed::Helpers::Migration do
+  let(:migration_class) do
+    Class.new(ActiveRecord::Migration[6.0]) do
+      include Delayed::Helpers::Migration
+
+      attr_accessor :migration_start
+
+      def connection
+        ActiveRecord::Base.connection
+      end
+
+      def reversible
+        direction = Object.new
+        def direction.up
+          yield if block_given?
+        end
+
+        def direction.down
+          yield if block_given?
+        end
+        yield direction
+      end
+    end
+  end
+
+  let(:migration) { migration_class.new }
+
+  before do
+    migration.migration_start = Delayed::Job.db_time_now
+  end
+
+  describe '#upsert_index retry behavior' do
+    it 'raises exception when wait_timeout is exceeded based on @migration_start' do
+      migration.migration_start = Delayed::Job.db_time_now - 6.minutes
+
+      allow(migration).to receive(:add_index).and_raise(ActiveRecord::LockWaitTimeout)
+      allow(migration.connection).to receive(:indexes).and_return([])
+
+      expect {
+        migration.upsert_index(:delayed_jobs, :name, wait_timeout: 5.minutes)
+      }.to raise_error(ActiveRecord::LockWaitTimeout)
+    end
+
+    it 're-checks for invalid index and drops it before retrying after timeout' do
+      add_index_calls = 0
+      remove_index_calls = 0
+      lookup_calls = 0
+
+      invalid_opts = ActiveRecord.version >= Gem::Version.new('7.1.0') ? { valid?: false } : { unique: true }
+      invalid_index = instance_double(
+        ActiveRecord::ConnectionAdapters::IndexDefinition,
+        name: 'test_idx',
+        columns: ['name'],
+        **invalid_opts,
+      )
+
+      allow(migration.connection).to receive(:indexes) do
+        lookup_calls += 1
+        lookup_calls == 2 ? [invalid_index] : []
+      end
+
+      allow(migration).to receive(:add_index) do |*_args|
+        add_index_calls += 1
+        raise ActiveRecord::StatementTimeout, 'timeout' if add_index_calls == 1
+      end
+
+      allow(migration).to receive(:remove_index) do |*_args|
+        remove_index_calls += 1
+      end
+
+      migration.upsert_index(:delayed_jobs, :name, name: 'test_idx', wait_timeout: 5.minutes)
+
+      expect(lookup_calls).to eq(3)
+      expect(remove_index_calls).to eq(1)
+      expect(add_index_calls).to eq(2)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Nathan Griffith
@@ -19,7 +19,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-19 00:00:00.000000000 Z
+date: 2026-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,6 +108,7 @@ files:
 - spec/delayed/__snapshots__/job_spec.rb.snap
 - spec/delayed/__snapshots__/monitor_spec.rb.snap
 - spec/delayed/active_job_adapter_spec.rb
+- spec/delayed/helpers/migration_spec.rb
 - spec/delayed/job_spec.rb
 - spec/delayed/monitor_spec.rb
 - spec/delayed/plugins/instrumentation_spec.rb
@@ -160,6 +161,7 @@ test_files:
 - spec/delayed/__snapshots__/job_spec.rb.snap
 - spec/delayed/__snapshots__/monitor_spec.rb.snap
 - spec/delayed/active_job_adapter_spec.rb
+- spec/delayed/helpers/migration_spec.rb
 - spec/delayed/job_spec.rb
 - spec/delayed/monitor_spec.rb
 - spec/delayed/plugins/instrumentation_spec.rb