switchman-inst-jobs 4.3.2 → 4.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 024c887329179bac0f9961d4ee813225593d3012efdfcb90747dfc8013b470d3
-  data.tar.gz: bcc91999036a817920b7a529a84cbe4f7dffc51e3629f14910e6d9dc44ffef6f
+  metadata.gz: 2801cf9e3bb894d8c46915457a1b1cf2f77ca10e49e1947665eb077a8bb58378
+  data.tar.gz: 558b1db888887f7463c8cafc3399001341be364dea5e5ff15d88a1213d9ed420
 SHA512:
-  metadata.gz: 97ffa7cb9912e45e88330df7dc5ef8d56868f6c1ad09829dc331c9c973096fb82d4518a2b4873a1f6b1572cab5cac947e0a2132e630209aebe9f6f3d9da7e6c9
-  data.tar.gz: e48e3ad03914eac68efdcb8d5dde9cb2abc0e5f42d9ff883b035176d223838ccf8377b36561af493b7e8ace9a88192a562f651d0297b4d7142c75053fdfc6129
+  metadata.gz: b01ca10ff4988509cee9728241d954b4b9bbfc6e2c9971730235f9adbcf50694bcae0226362f68a9e5602591368cf24e866ea0fbf653b05091184f7406fef774
+  data.tar.gz: 0b15b1296d8b5bf887f7ca8bd745886757e57e76591829ea2028b4c7a7c803bd86bc219cca4df630b49e8d61807b088437f94c5eb40b0daa8aac4111ebedb4fd

data/lib/switchman_inst_jobs/switchman/shard.rb

@@ -22,56 +22,82 @@ module SwitchmanInstJobs
       # Adapted from hold/unhold methods in base delayed jobs base
       # Wait is required to be able to safely move jobs
       def hold_jobs!(wait: false)
-        self.jobs_held = true
-        save! if changed?
-        delayed_jobs_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
-          lock_jobs_for_hold
-        end
-        return unless wait
-
-        delayed_jobs_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
-          while ::Delayed::Job.where(shard_id: id)
-                              .where.not(locked_at: nil)
-                              .where.not(locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY).exists?
-            sleep 10
-            lock_jobs_for_hold
-          end
-        end
+        ::Switchman::Shard.where(id: self).hold_jobs!(wait:)
       end
 
       def unhold_jobs!
-        self.jobs_held = false
-        if changed?
-          save!
+        ::Switchman::Shard.where(id: self).unhold_jobs!
+      end
+
+      module ClassMethods
+        # Adapted from hold/unhold methods in base delayed jobs base
+        # Wait is required to be able to safely move jobs
+        def hold_jobs!(wait: false)
+          shards = all.to_a
+          wait_for_caches = false
+          shards.each do |shard|
+            shard.jobs_held = true
+            if shard.changed?
+              shard.save!
+              wait_for_caches = true if wait
+            end
+          end
+          shards_by_jobs_shard(shards).each do |jobs_shard, shard_ids|
+            jobs_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
+              lock_jobs_for_hold(shard_ids)
+            end
+          end
+          return unless wait
+
           # Wait a little over the 60 second in-process shard cache clearing
           # threshold to ensure that all new jobs are now being enqueued
-          # unlocked
+          # locked
           Rails.logger.debug("Waiting for caches to clear")
-          sleep(65)
-        end
-        delayed_jobs_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
-          ::Delayed::Job.where(locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY, shard_id: id)
-                        .in_batches(of: 10_000)
-                        .update_all(
-                          locked_by: nil,
-                          locked_at: nil,
-                          attempts: 0,
-                          failed_at: nil
-                        )
+          sleep(65) if wait && wait_for_caches
+
+          shards_by_jobs_shard(shards).each do |jobs_shard, shard_ids|
+            jobs_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
+              while ::Delayed::Job.where(shard_id: shard_ids)
+                                  .where.not(locked_at: nil)
+                                  .where.not(locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY).exists?
+                sleep 10
+                lock_jobs_for_hold(shard_ids)
+              end
+            end
+          end
         end
-      end
-
-      private
 
-      def lock_jobs_for_hold
-        ::Delayed::Job.where(locked_at: nil, shard_id: id).in_batches(of: 10_000).update_all(
-          locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY,
-          locked_at: ::Delayed::Job.db_time_now,
-          attempts: ::Delayed::Backend::Base::ON_HOLD_COUNT
-        )
-      end
+        def unhold_jobs!
+          shards = all.to_a
+          waited = false
+          shards.each do |shard|
+            shard.jobs_held = false
+            next unless shard.changed?
+
+            shard.save!
+            next if waited
+
+            # Wait a little over the 60 second in-process shard cache clearing
+            # threshold to ensure that all new jobs are now being enqueued
+            # unlocked
+            Rails.logger.debug("Waiting for caches to clear")
+            sleep(65)
+            waited = true
+          end
+          shards_by_jobs_shard(shards).each do |jobs_shard, shard_ids|
+            jobs_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
+              ::Delayed::Job.where(locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY, shard_id: shard_ids)
+                            .in_batches(of: 10_000)
+                            .update_all(
+                              locked_by: nil,
+                              locked_at: nil,
+                              attempts: 0,
+                              failed_at: nil
+                            )
+            end
+          end
+        end
 
-      module ClassMethods
         def clear_cache
           super
           remove_instance_variable(:@delayed_jobs_shards) if instance_variable_defined?(:@delayed_jobs_shards)
@@ -130,6 +156,22 @@ module SwitchmanInstJobs
 
           ::Switchman::Shard.merge(scope)
         end
+
+        private
+
+        # Group the given shards by the shard their jobs live on, returning a
+        # hash of delayed_jobs_shard => [shard_id, ...]
+        def shards_by_jobs_shard(shards)
+          shards.group_by(&:delayed_jobs_shard).transform_values { |group| group.map(&:id) }
+        end
+
+        def lock_jobs_for_hold(shard_ids)
+          ::Delayed::Job.where(locked_at: nil, shard_id: shard_ids).in_batches(of: 10_000).update_all(
+            locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY,
+            locked_at: ::Delayed::Job.db_time_now,
+            attempts: ::Delayed::Backend::Base::ON_HOLD_COUNT
+          )
+        end
       end
     end
   end

data/lib/switchman_inst_jobs/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.3.3
 platform: ruby
 authors:
 - Bryan Petty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-02 00:00:00.000000000 Z
+date: 2026-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs