delayed 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b69cac642b56964d70aba6e210125180c11fcd690ffe666a6501db5f5cc52779
-  data.tar.gz: 6a2aca999b32ec0d2fb28fde33bb57725085c090eb6f2bcee29e50baa8f66a6f
+  metadata.gz: 16d1a1a8e3f41bee282a4d725afdf3be6419fceba8c5cef58a3eb35a7a406823
+  data.tar.gz: 9ad241b6880c13997ea7b58ba2bcfba02a1beb6692b050698fac30301cc9c90c
 SHA512:
-  metadata.gz: d74267db864b39c8861136fc374a392608f08b47400cc872adfc5c19cc4188be202a4f6e68354f370987f56c9f5f7f9221432358c0a4663021b1718e18703127
-  data.tar.gz: ac7f99b72554e9ec1ad69ecace6f637bd9aec6d6f4a74034030962ffc0542b3761542622775f52225e762ab248ef9e57a691b07852a16673574998fdb0099585
+  metadata.gz: a63a4f0a56f26c9b5bb3a987b6c2877068016823b21efb059744effc0eeb68255b4b193e7f0e0292f6d790e12138ad8c57bab032a7f1f3c1a89e2c533db45df6
+  data.tar.gz: 7912ee6d5d633293a2f1707d890c2fd5a60cbdb1c44ec215a8d2414db35902a272e4caad4ece1947c6475f4e90a7b5c1fe54ef320549681c04c948d7786cd4a8

data/lib/delayed/helpers/migration.rb

@@ -20,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 = [
@@ -48,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
@@ -61,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.1'
+  VERSION = '2.0.2'
 end

data/spec/delayed/helpers/migration_spec.rb

@@ -33,35 +33,50 @@ describe Delayed::Helpers::Migration do
     migration.migration_start = Delayed::Job.db_time_now
   end
 
-  describe '#with_retry_loop timeout tracking' do
+  describe '#upsert_index retry behavior' do
     it 'raises exception when wait_timeout is exceeded based on @migration_start' do
-      # Simulate migration that started 6 minutes ago
       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.with_retry_loop(wait_timeout: 5.minutes) do
-          raise ActiveRecord::LockWaitTimeout
-        end
+        migration.upsert_index(:delayed_jobs, :name, wait_timeout: 5.minutes)
       }.to raise_error(ActiveRecord::LockWaitTimeout)
     end
 
-    it 'continues retrying while within the timeout window' do
-      call_count = 0
+    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
 
-      # First retry is within timeout, second exceeds it
-      allow(Delayed::Job).to receive(:db_time_now).and_return(
-        migration.migration_start + 4.minutes, # Within timeout
-        migration.migration_start + 6.minutes, # Exceeds timeout
+      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,
       )
 
-      expect {
-        migration.with_retry_loop(wait_timeout: 5.minutes) do
-          call_count += 1
-          raise ActiveRecord::LockWaitTimeout
-        end
-      }.to raise_error(ActiveRecord::LockWaitTimeout)
+      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(call_count).to eq(2)
+      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.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Nathan Griffith