switchman-inst-jobs 4.2.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1c01e6bdfd2a5cd3ddd756936a2793526c8e8860883bcd1ea8caa9febad979d
-  data.tar.gz: 4998d1686e5dfceffb5c1a41dcf0959266c8caf73bd99aa0e50e89523e41ba51
+  metadata.gz: 3d126fdf9fae2bd957760dd1fdf1cac821e5103eb691fc2b293b3bda6170bb5c
+  data.tar.gz: 977e7915aea7e1e389ad95c190e5ae749a868f869f1d28542ee264342f57b89e
 SHA512:
-  metadata.gz: aae64990ef75016c24ded178bf0edcf4b4343499b6d226d6c86104d9d15d23bd7a77acf35e622aff989e3292d0abf59bd15d4dd3d20e11e4f9e66e4fe393e581
-  data.tar.gz: 854dd08052ca1b042646ce2fd08c4c0f76d2f5075f11ecebf34f04f8293c3ab2c8d9977817adf2b5e0f6e4c67a6726e49bd4dc9d491b961a391588e78c22a274
+  metadata.gz: 407591bf52c6068c6133b1654a68ffacb4aae0c0d941f7bdab9536a682c70a0a3ca04017c68e61ac6475fbd75a0b7cb93c35b1ce94e6e54b69fb638020802225
+  data.tar.gz: d5a69e5b56e07f4c90dcd5fea9f28f491c56f832acdd821b081ee5d3bb068af516b9ca114d464cda4f154edf4765b91c3d10c05f60b31c6612b5e72dca0c79ec

data/db/migrate/20260120092005_add_previous_jobs_shard.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPreviousJobsShard < ActiveRecord::Migration[7.1]
+  def change
+    add_reference :switchman_shards, :previous_delayed_jobs_shard, foreign_key: { to_table: :switchman_shards }, index: false, if_not_exists: true
+  end
+end

data/lib/switchman_inst_jobs/jobs_migrator.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require "parallel"
 
 module SwitchmanInstJobs
@@ -36,12 +35,24 @@ module SwitchmanInstJobs
       end
 
       def migrate_shards(shard_map)
-        source_shards = Set[]
+        effective_map = shard_map.dup
+        source_shards = Hash.new([].freeze)
         target_shards = Hash.new([].freeze)
-        shard_map.each do |(shard, target_shard)|
+        # Also add any incomplete moves to the source shards to ensure we clean up appropriately
+        ::Switchman::Shard.where.not(previous_delayed_jobs_shard_id: nil).find_each do |shard|
+          effective_map[shard.id] ||= shard.delayed_jobs_shard.id
+        end
+        effective_map.each do |(shard, target_shard)|
           shard = ::Switchman::Shard.find(shard) unless shard.is_a?(::Switchman::Shard)
-          source_shards << shard.delayed_jobs_shard.id
           target_shard = target_shard.try(:id) || target_shard
+          # if a move was interrupted, the new shard is already set as the delayed_jobs_shard
+          # but we still have the old shard stored in previous_delayed_jobs_shard and should
+          # act as if we are moving from there in the first place
+          if shard.previous_delayed_jobs_shard_id && shard.delayed_jobs_shard.id == target_shard
+            source_shards[shard.previous_delayed_jobs_shard_id] += [shard.id]
+          else
+            source_shards[shard.delayed_jobs_shard.id] += [shard.id]
+          end
           target_shards[target_shard] += [shard.id]
 
           @validation_callbacks&.each do |proc|
@@ -49,26 +60,33 @@ module SwitchmanInstJobs
           end
         end
 
-        # Do the updates in batches and then just clear redis instead of clearing them one at a time
-        target_shards.each do |target_shard, shards|
-          updates = { delayed_jobs_shard_id: target_shard, block_stranded: true }
-          updates[:updated_at] = Time.zone.now if ::Switchman::Shard.column_names.include?("updated_at")
-          ::Switchman::Shard.where(id: shards).update_all(updates)
+        ::Switchman::Shard.transaction do
+          # Do the updates in batches and then just clear redis instead of clearing them one at a time
+          source_shards.each do |source_shard, shards|
+            updates = { previous_delayed_jobs_shard_id: source_shard }
+            ::Switchman::Shard.where(id: shards).update_all(updates)
+          end
+          target_shards.each do |target_shard, shards|
+            updates = { delayed_jobs_shard_id: target_shard, block_stranded: true }
+            updates[:updated_at] = Time.zone.now if ::Switchman::Shard.column_names.include?("updated_at")
+            ::Switchman::Shard.where(id: shards).update_all(updates)
+          end
         end
         clear_shard_cache(default: ::Switchman::Shard.exists?(id: target_shards.values.flatten, default: true))
 
         ::Switchman::Shard.clear_cache
         # rubocop:disable Style/CombinableLoops
         # We first migrate strands so that we can stop blocking strands before we migrate unstranded jobs
-        source_shards.each do |s|
+        source_shards.each_key do |s|
           ::Switchman::Shard.lookup(s).activate(::Delayed::Backend::ActiveRecord::AbstractJob) { migrate_strands }
         end
 
-        source_shards.each do |s|
+        source_shards.each_key do |s|
           ::Switchman::Shard.lookup(s).activate(::Delayed::Backend::ActiveRecord::AbstractJob) { migrate_everything }
         end
-        ensure_unblock_stranded_for(shard_map.map(&:first))
+        ensure_unblock_stranded_for(effective_map.map(&:first))
         # rubocop:enable Style/CombinableLoops
+        ::Switchman::Shard.where(id: effective_map.map(&:first)).update_all(previous_delayed_jobs_shard_id: nil)
       end
 
       # if :migrate_strands ran on any shards that fell into scenario 1, then
@@ -350,8 +368,8 @@ module SwitchmanInstJobs
 
       private
 
-      def create_blocker_job(**kwargs)
-        first_job = ::Delayed::Job.create!(**kwargs, next_in_strand: false)
+      def create_blocker_job(**)
+        first_job = ::Delayed::Job.create!(**, next_in_strand: false)
         first_job.payload_object = ::Delayed::PerformableMethod.new(Kernel, :sleep, args: [0])
         first_job.tag = "Kernel.sleep"
         first_job.source = "JobsMigrator::StrandBlocker"

data/lib/switchman_inst_jobs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SwitchmanInstJobs
-  VERSION = "4.2.0"
+  VERSION = "4.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Bryan Petty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-22 00:00:00.000000000 Z
+date: 2026-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
@@ -53,7 +53,7 @@ dependencies:
         version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: switchman
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,7 @@ files:
 - db/migrate/20220203063200_remove_old_singleton_index.rb
 - db/migrate/20220328152900_add_failed_jobs_indicies.rb
 - db/migrate/20220519204546_add_requeued_job_id_to_failed_jobs.rb
+- db/migrate/20260120092005_add_previous_jobs_shard.rb
 - lib/switchman-inst-jobs.rb
 - lib/switchman_inst_jobs.rb
 - lib/switchman_inst_jobs/active_record/connection_adapters/postgresql_adapter.rb
@@ -171,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="