switchman-inst-jobs 4.0.17 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31b6b1d2dfe3070a63ed755c287ae3b744a42bf16fc57d62dcbc28569e8adeed
-  data.tar.gz: 7ab79f81effb0e8da6ee01efea3cb10920f601a5a007d6c55b784983b190f1b3
+  metadata.gz: e1c01e6bdfd2a5cd3ddd756936a2793526c8e8860883bcd1ea8caa9febad979d
+  data.tar.gz: 4998d1686e5dfceffb5c1a41dcf0959266c8caf73bd99aa0e50e89523e41ba51
 SHA512:
-  metadata.gz: f8e90f264c6027a3107313569d2d394724bde9a7e30fd1a9b57cafff248bafc8c0405b99018a126e6d7c94bdddda8ec803b080b4fbcb4f5e1b2abceb68f2d02a
-  data.tar.gz: e7935969ea9bfca9f67b6d133220e6355b264fca916bb003ce8e3e1c0134d77c1d2de59c162623ed783b19fd3c27faeab204a8984c72e3f79967ece531957b24
+  metadata.gz: aae64990ef75016c24ded178bf0edcf4b4343499b6d226d6c86104d9d15d23bd7a77acf35e622aff989e3292d0abf59bd15d4dd3d20e11e4f9e66e4fe393e581
+  data.tar.gz: 854dd08052ca1b042646ce2fd08c4c0f76d2f5075f11ecebf34f04f8293c3ab2c8d9977817adf2b5e0f6e4c67a6726e49bd4dc9d491b961a391588e78c22a274

data/lib/switchman_inst_jobs/delayed/backend/base.rb

@@ -21,7 +21,7 @@ module SwitchmanInstJobs
             ::Switchman::Shard.periodic_clear_shard_cache
             current_shard = options[:current_shard] || ::Switchman::Shard.current
             enqueue_options = options.merge(
-              current_shard: current_shard
+              current_shard:
             )
             enqueue_job = -> { ::GuardRail.activate(:primary) { super(object, **enqueue_options) } }
 
@@ -48,9 +48,7 @@ module SwitchmanInstJobs
             end
           end
 
-          def configured_shard_ids
-            ::SwitchmanInstJobs::Delayed::Settings.configured_shard_ids
-          end
+          delegate :configured_shard_ids, to: :"::SwitchmanInstJobs::Delayed::Settings"
 
           def processes_locked_locally
             shard_ids = configured_shard_ids

data/lib/switchman_inst_jobs/guard_rail.rb

@@ -3,7 +3,7 @@
 module SwitchmanInstJobs
   module GuardRail
     module ClassMethods
-      def activate(env, &block)
+      def activate(env, &)
         if ::ActiveRecord::Migration.open_migrations.positive?
           yield
         else

data/lib/switchman_inst_jobs/jobs_migrator.rb

@@ -21,7 +21,7 @@ module SwitchmanInstJobs
         @validation_callbacks = []
       end
 
-      def transaction_on(shards, &block)
+      def transaction_on(shards, &)
         return yield if shards.empty?
 
         shard = shards.pop
@@ -29,7 +29,7 @@ module SwitchmanInstJobs
         shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
           ::Delayed::Job.transaction do
             current_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
-              transaction_on(shards, &block)
+              transaction_on(shards, &)
             end
           end
         end
@@ -37,7 +37,7 @@ module SwitchmanInstJobs
 
       def migrate_shards(shard_map)
         source_shards = Set[]
-        target_shards = Hash.new([])
+        target_shards = Hash.new([].freeze)
         shard_map.each do |(shard, target_shard)|
           shard = ::Switchman::Shard.find(shard) unless shard.is_a?(::Switchman::Shard)
           source_shards << shard.delayed_jobs_shard.id
@@ -45,7 +45,7 @@ module SwitchmanInstJobs
           target_shards[target_shard] += [shard.id]
 
           @validation_callbacks&.each do |proc|
-            proc.call(shard: shard, target_shard: ::Switchman::Shard.find(target_shard))
+            proc.call(shard:, target_shard: ::Switchman::Shard.find(target_shard))
           end
         end
 
@@ -171,10 +171,10 @@ module SwitchmanInstJobs
                   # 4) is taken care of here, by leaving next_in_strand alone and
                   # it should execute on the new shard
                   batch_move_jobs(
-                    target_shard: target_shard,
-                    source_shard: source_shard,
+                    target_shard:,
+                    source_shard:,
                     scope: jobs_scope,
-                    batch_size: batch_size
+                    batch_size:
                   ) do |job, new_job|
                     # This ensures jobs enqueued on the old jobs shard run before jobs on the new jobs queue
                     new_job.strand_order_override = job.strand_order_override - 1
@@ -190,7 +190,7 @@ module SwitchmanInstJobs
         all_scope = ::Delayed::Job.shard(source_shard).where("strand IS NOT NULL OR singleton IS NOT NULL")
 
         singleton_blocker_additional_kwargs = {
-          locked_at: DateTime.now,
+          locked_at: Time.now.utc,
           locked_by: ::Delayed::Backend::Base::ON_HOLD_BLOCKER
         }
 
@@ -230,14 +230,16 @@ module SwitchmanInstJobs
         blocked_shard_ids = blocked_shards.pluck(:id)
         query = lambda { |column, scope|
           ::Delayed::Job
-            .where(id: ::Delayed::Job.select("DISTINCT ON (#{column}) id")
-              .where(scope)
+            .where(id: ::Delayed::Job
+              .with(all_col: ::Delayed::Job.and(scope).distinct.select(column))
+              .with(blocked_col: ::Delayed::Job.from("all_col").select(column).where.not(
+                ::Delayed::Job.select(1)
+                  .where(next_in_strand: true).or(::Delayed::Job.where(source: "JobsMigrator::StrandBlocker"))
+                  .where("#{column} = all_col.#{column}").arel.exists
+              ))
+              .select("DISTINCT ON (#{column}) id")
               .where.not(shard_id: blocked_shard_ids)
-              .where(
-                ::Delayed::Job.select(1).from("#{::Delayed::Job.quoted_table_name} dj2")
-                .where("dj2.next_in_strand = true OR dj2.source = 'JobsMigrator::StrandBlocker'")
-                .where("dj2.#{column} = delayed_jobs.#{column}").arel.exists.not
-              )
+              .where({ column => ::Delayed::Job.from("blocked_col").select(column) })
               .order(column, :strand_order_override, :id)).limit(batch_size)
         }
 
@@ -249,12 +251,13 @@ module SwitchmanInstJobs
           # batches
 
           loop do
-            break if query.call(:strand, "strand IS NOT NULL").update_all(next_in_strand: true).zero?
+            break if query.call(:strand, ::Delayed::Job.where.not(strand: nil)).update_all(next_in_strand: true).zero?
           end
 
           loop do
             break if query.call(:singleton,
-                                "strand IS NULL AND singleton IS NOT NULL").update_all(next_in_strand: true).zero?
+                                ::Delayed::Job.where(strand: nil)
+                                .where.not(singleton: nil)).update_all(next_in_strand: true).zero?
           end
         end
       end
@@ -266,10 +269,10 @@ module SwitchmanInstJobs
         shard_map = build_shard_map(scope, source_shard)
         shard_map.each do |(target_shard, source_shard_ids)|
           batch_move_jobs(
-            target_shard: target_shard,
-            source_shard: source_shard,
+            target_shard:,
+            source_shard:,
             scope: scope.where(shard_id: source_shard_ids).where(locked_by: nil),
-            batch_size: batch_size
+            batch_size:
           )
         end
       end
@@ -291,7 +294,7 @@ module SwitchmanInstJobs
       end
 
       def unblock_strand!(strand, new_parallelism: nil)
-        job_scope = ::Delayed::Job.where(strand: strand)
+        job_scope = ::Delayed::Job.where(strand:)
         raise JobsBlockedError if blocked_by_migrator?(job_scope)
 
         ::Delayed::Job.transaction do
@@ -321,7 +324,7 @@ module SwitchmanInstJobs
       end
 
       def unblock_singleton!(singleton)
-        job_scope = ::Delayed::Job.where(strand: nil, singleton: singleton)
+        job_scope = ::Delayed::Job.where(strand: nil, singleton:)
         raise JobsBlockedError if blocked_by_migrator?(job_scope)
 
         ::Delayed::Job.transaction do
@@ -334,7 +337,7 @@ module SwitchmanInstJobs
           if next_in_strand
             0
           elsif id
-            ::Delayed::Job.where(id: id).update_all(next_in_strand: true)
+            ::Delayed::Job.where(id:).update_all(next_in_strand: true)
           end
         end
       end
@@ -403,7 +406,7 @@ module SwitchmanInstJobs
             @before_move_callbacks&.each do |proc|
               proc.call(
                 old_job: job,
-                new_job: new_job
+                new_job:
               )
             end
             new_job

data/lib/switchman_inst_jobs/new_relic.rb

@@ -6,14 +6,14 @@ module SwitchmanInstJobs
       module NewRelicJobInvoker
         include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation if defined?(::NewRelic)
 
-        def invoke_job(*args, &block)
+        def invoke_job(...)
           options = {
             category: NR_TRANSACTION_CATEGORY,
             path: tag
           }
 
           perform_action_with_newrelic_trace(options) do
-            super(*args, &block)
+            super(...)
           end
         end
       end

data/lib/switchman_inst_jobs/switchman/shard.rb

@@ -100,7 +100,7 @@ module SwitchmanInstJobs
 
         def periodic_clear_shard_cache
           # TODO: make this configurable
-          @timed_cache ||= TimedCache.new(-> { 60.to_i.seconds.ago }) do
+          @timed_cache ||= TimedCache.new(-> { 60.seconds.ago }) do
             ::Switchman::Shard.clear_cache
           end
           @timed_cache.clear

data/lib/switchman_inst_jobs/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 4.0.17
+  version: 4.2.0
 platform: ruby
 authors:
 - Bryan Petty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-13 00:00:00.000000000 Z
+date: 2025-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
@@ -50,20 +50,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: switchman
   requirement: !ruby/object:Gem::Requirement
@@ -84,202 +84,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: diplomat
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.1
-- !ruby/object:Gem::Dependency
-  name: newrelic_rpm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-inst
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.10'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
 description:
 email:
 - bpetty@instructure.com
@@ -367,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="