inst-jobs 3.1.4 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bea5022e36cc4d9748d96fd7abadcdf15e86704c0b79551ccabf32d093ad4fa
-  data.tar.gz: 262023f6a3892f685b31a97437913689b4b6c2f6017600a05e325030a3f6c620
+  metadata.gz: e33f94a9740d7ecb8c90f2473450468397ac1c3df195a5c7a957ea7d10861cb1
+  data.tar.gz: '0820afd8c1ffde55f0c1ff8ef31ca37e020e8cfe7ae8068aca476473ee4ea5e3'
 SHA512:
-  metadata.gz: d073c05f492b416d0fa0a3a16e9337635289afc53107239d1bbf1b41370f0baad837315f59f997be912db61f13fc1b320aefb8ec68c9ccafce8f3eeb2825d266
-  data.tar.gz: 7f2182ecdea50d3e547d2b4fa1d99a1bcaace68936ae49fd006c5d03f7b4e4e008bcd792c1b35b0157379182b24d1bac8cca34c5c2dc85637953212db140e33c
+  metadata.gz: 10d3bd5fb8193811f144aa094f2d81e1366efe9d476ec5f9b3386637e1f59b8d0c362fed2208f3f5e6f771def087bed5eeb7a04057b098c3ee8d441562d5efe7
+  data.tar.gz: d7d8f75f6e4d75b23003a018694dc17973e05a88e0408687deaf64c20cb81174ef65ad1b852aa5e1bed9141f590d107ce694a793229ca23db0180600ab58a602

data/lib/delayed/backend/active_record.rb

@@ -29,9 +29,9 @@ module Delayed
 
         def self.reconnect!
           if Rails.version < "6.1"
-            ActiveRecord::Base.connection_handler.clear_all_connections!
+            ::ActiveRecord::Base.connection_handler.clear_all_connections!
           else
-            ActiveRecord::Base.connection_handler.clear_all_connections!(nil)
+            ::ActiveRecord::Base.connection_handler.clear_all_connections!(nil)
           end
         end
 
@@ -320,6 +320,24 @@ module Delayed
           scope.order(Arel.sql("COUNT(tag) DESC")).count.map { |t, c| { tag: t, count: c } }
         end
 
+        # given a scope of non-stranded queued jobs, apply a temporary strand to throttle their execution
+        # returns [job_count, new_strand]
+        # (this is designed for use in a Rails console or the Canvas Jobs interface)
+        def self.apply_temp_strand!(job_scope, max_concurrent: 1)
+          if job_scope.where("strand IS NOT NULL OR singleton IS NOT NULL").exists?
+            raise ArgumentError, "can't apply strand to already stranded jobs"
+          end
+
+          job_count = 0
+          new_strand = "tmp_strand_#{SecureRandom.alphanumeric(16)}"
+          ::Delayed::Job.transaction do
+            job_count = job_scope.update_all(strand: new_strand, max_concurrent: max_concurrent, next_in_strand: false)
+            ::Delayed::Job.where(strand: new_strand).order(:id).limit(max_concurrent).update_all(next_in_strand: true)
+          end
+
+          [job_count, new_strand]
+        end
+
         def self.maybe_silence_periodic_log(&block)
           if Settings.silence_periodic_log
             ::ActiveRecord::Base.logger.silence(&block)

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = "3.1.4"
+  VERSION = "3.1.6"
 end

data/lib/delayed/work_queue/parent_process/server.rb

@@ -227,9 +227,9 @@ module Delayed
             # otherwise just reconnect and let it retry
             logger.warn("failed to unlock prefetched jobs - connection terminated; skipping for now")
             if Rails.version < "6.1"
-              Delayed::Job.clear_all_connections!
+              ::Delayed::Job.clear_all_connections!
             else
-              Delayed::Job.clear_all_connections!(nil)
+              ::Delayed::Job.clear_all_connections!(nil)
             end
           end
         end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.6
 platform: ruby
 authors:
 - Cody Cutrer
 - Ethan Vizitei
 - Jacob Burroughs
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-01 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -192,14 +192,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.6.3
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -410,7 +410,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - cody@instructure.com
 - evizitei@instructure.com
@@ -504,7 +504,7 @@ homepage: https://github.com/instructure/inst-jobs
 licenses: []
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -520,7 +520,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
 test_files: []