switchman-inst-jobs 4.3.2 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 024c887329179bac0f9961d4ee813225593d3012efdfcb90747dfc8013b470d3
-  data.tar.gz: bcc91999036a817920b7a529a84cbe4f7dffc51e3629f14910e6d9dc44ffef6f
+  metadata.gz: f308b462ca12380d7575235b5e462045d03bcdf3602265c8ce526700b1846b6b
+  data.tar.gz: ed883697bf559536dd84364e8a40b74465c790fa72b66268151d66812b7fda07
 SHA512:
-  metadata.gz: 97ffa7cb9912e45e88330df7dc5ef8d56868f6c1ad09829dc331c9c973096fb82d4518a2b4873a1f6b1572cab5cac947e0a2132e630209aebe9f6f3d9da7e6c9
-  data.tar.gz: e48e3ad03914eac68efdcb8d5dde9cb2abc0e5f42d9ff883b035176d223838ccf8377b36561af493b7e8ace9a88192a562f651d0297b4d7142c75053fdfc6129
+  metadata.gz: 2258e5e4aae65d9fac61d9037ec3ece167c5f18dae08050167d9175384e231137dddeed8774950646484e6f8d6b165c4287977ec6aa78f3261bf486944e268ca
+  data.tar.gz: c715f2e7cf3b31af9860c1be5db6cca0bb784327acb3a0647980ca3f760dda160398dfc51f68490309ddb71f56abab0fd430c8a99e3d7add6efc7a20688101aa

data/lib/switchman_inst_jobs/jobs_migrator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "parallel"
-
 module SwitchmanInstJobs
   class JobsMigrator
     class << self

data/lib/switchman_inst_jobs/switchman/default_shard.rb

@@ -7,11 +7,11 @@ module SwitchmanInstJobs
         self
       end
 
-      def jobs_held
+      def jobs_held # rubocop:disable Naming/PredicateMethod
         false
       end
 
-      def block_stranded
+      def block_stranded # rubocop:disable Naming/PredicateMethod
         false
       end
     end

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/timed_cache.rb

@@ -8,7 +8,7 @@ module SwitchmanInstJobs
       @cached_at = Time.zone.now
     end
 
-    def clear(force: false)
+    def clear(force: false) # rubocop:disable Naming/PredicateMethod
       if force || @cached_at < @timeout.call
         @block.call
         @cached_at = Time.zone.now

data/lib/switchman_inst_jobs/version.rb

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

data/lib/switchman_inst_jobs.rb

@@ -7,9 +7,7 @@ module SwitchmanInstJobs
   cattr_accessor :delayed_jobs_shard_fallback
 
   def self.initialize_active_record
-    ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(
-      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-    )
+    ActiveSupport.on_load(:active_record_postgresqladapter) { prepend ActiveRecord::ConnectionAdapters::PostgreSQLAdapter }
   end
 
   def self.initialize_inst_jobs

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.4.0
 platform: ruby
 authors:
 - Bryan Petty
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
@@ -30,61 +29,40 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.19'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: switchman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.14
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.14
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-description:
+        version: '4.3'
 email:
 - bpetty@instructure.com
 executables: []
@@ -164,7 +142,6 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -172,15 +149,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Switchman and Instructure Jobs compatibility gem.
 test_files: []