rails-archiver 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b31d762ea01d15091eebffd02a581b9ae2a20fba31005ec2669b4cf0d350125
-  data.tar.gz: 6f553c01c3a2d02062c74384c09a8e220845907544009f8d64ea97313afba6af
+  metadata.gz: ddfcaefd86b70ef668e8ba941e20f68a96a62a704ad9e931fbe72343a6ef7ddb
+  data.tar.gz: d3283d3fbbb8abeafab718a445b7f129cef999f531b7766998af860c22de2c90
 SHA512:
-  metadata.gz: 11961ec8a0cacd1101792d3beade62fa79eb224a3c254edcb42a67a0a0f16ce423f7fefec0a5adb1b535ee5a33864e6dd5e02d8e8df22b83f1f490925741e9ae
-  data.tar.gz: 3f37961ca490f99900f3de97e0e76d4b6ae83e9fa7977ebadedfb55784102b8d33dc8975aead38af477d3732350774212b8b11f323ae3a093a05aaca34a4811f
+  metadata.gz: a69726e5dff1eb032dcb915c67804cce258f970652045561a52a727a073493844a5879d79e2bb982d6a9427c834f0d33e1873759c29c463765d65894cb19674e
+  data.tar.gz: 34eb78437f58aced9d64fe518e0183f8ecc5dc24e8d24e88194d7d379a5c9ecd138c00bbc46f54f23fef280ea8994acd12b8c9a86decbc0d3fa04d9014896917

data/CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# [0.3.0] - 2025-05-22
+- Added retries for delete table operations to handle SQL Timeouts and deadlocks.
+
 # [0.2.0] - 2025-01-20
 - Added support for enum columns - should be able to handle both keys and values.
 - Refactored the `unarchiver` method to more easily subclass `Unarchiver`.

data/lib/rails-archiver/archiver.rb

@@ -1,4 +1,5 @@
 require 'tmpdir'
+require 'rails-archiver/utils/deadlock_retry'
 # Takes a database model and:
 # 1) Visits all dependent associations
 # 2) Saves everything in one giant JSON hash
@@ -122,7 +123,9 @@ module RailsArchiver
         delete_query = <<-SQL
           DELETE FROM `#{table}` WHERE `id` IN (#{group.compact.join(',')})
         SQL
-        ActiveRecord::Base.connection.delete(delete_query)
+        RailsArchiver::Utils::DeadlockRetry.wrap do
+          ActiveRecord::Base.connection.delete(delete_query)
+        end
       end
 
       @logger.info("Finished deleting from #{table}")

data/lib/rails-archiver/utils/deadlock_retry.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module RailsArchiver
+  module Utils
+    # Utility module to retry a block of code in case of a deadlock.
+    module DeadlockRetry
+      class << self
+
+        RETRY_COUNT = 2
+
+        def wrap(&block)
+          count = RETRY_COUNT
+          begin
+            ActiveRecord::Base.transaction(&block)
+          rescue ActiveRecord::Deadlocked, ActiveRecord::LockWaitTimeout => e
+            raise if count <= 0
+
+            Rails.logger.error("Error: #{e.message}. Retrying. #{count} attempts remaining")
+            count -= 1
+
+            sleep(Random.rand(5.0) + 0.5)
+
+            retry
+          end
+        end
+      end
+    end
+  end
+end

data/rails-archiver.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name         = 'rails-archiver'
   s.require_paths = %w(. lib lib/rails-archiver)
-  s.version      = '0.2.0'
-  s.date         = '2025-01-20'
+  s.version      = '0.3.0'
+  s.date         = '2025-05-22'
   s.summary      = 'Fully archive a Rails model'
   s.description  = <<-EOF
   EOF

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-archiver
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-20 00:00:00.000000000 Z
+date: 2025-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,6 +53,7 @@ files:
 - lib/rails-archiver/transport/in_memory.rb
 - lib/rails-archiver/transport/s3.rb
 - lib/rails-archiver/unarchiver.rb
+- lib/rails-archiver/utils/deadlock_retry.rb
 - rails-archiver.gemspec
 homepage: https://github.com/dorner/rails-archiver
 licenses: