switchman-inst-jobs 4.0.5 → 4.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d08a92d9006c02ccc63baced88bc83fa916a2c78f4634f6b4344de2807b2dc57
-  data.tar.gz: 6ff57e36692acaea9e87cc15129e29e79d1963216c65c471ce3decb5cf600045
+  metadata.gz: b220157fed7508b8f0412dcb44e31af64ae36f7752d0b9740376c910be115fe6
+  data.tar.gz: b35f1e9f59dab46393e6ff037f9c05d6b8f107bfd9a811a943865f4334785515
 SHA512:
-  metadata.gz: ae104486ac82a41356510c2793aeee3e883ee669192a72b694678b3c4800af9356308c4d938bd1f18432eecf4362897252c7ea7f13274b73c1050acab0fd6408
-  data.tar.gz: f372dfe516b76b19c68c861574b3c24c50af8b9f0101f4a846dfa7722fc43e162e0b907e9270362ca0217cf543ed3eb0288baf65ce4158d8f7e7ccb92b9fde2f
+  metadata.gz: fda1eb1f28deca4430edf8a37ec4c3b10e5323aa854d5358e887aa971b5f2d4c5ff8660e8e08aee24b850358ed2084c1532d72c053dcccf4bf8f23a565038cd2
+  data.tar.gz: abf4cf28af1cea47c438ca5215d24dd5aac4978ccd14f3d7f9d9a91f8b1f1bdce05b96c159961c238afd20d4ef9383d51ef40d198c7e9294672716d3123b3b58

data/db/migrate/20220328152900_add_failed_jobs_indicies.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddFailedJobsIndicies < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    add_index :failed_jobs, :failed_at, algorithm: :concurrently
+    add_index :failed_jobs, :strand, where: 'strand IS NOT NULL', algorithm: :concurrently
+    add_index :failed_jobs, :singleton, where: 'singleton IS NOT NULL', algorithm: :concurrently
+    add_index :failed_jobs, :tag, algorithm: :concurrently
+  end
+end

data/db/migrate/20220519204546_add_requeued_job_id_to_failed_jobs.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddRequeuedJobIdToFailedJobs < ActiveRecord::Migration[6.0]
+  def change
+    add_column :failed_jobs, :requeued_job_id, :integer, limit: 8
+  end
+end

data/lib/switchman_inst_jobs/delayed/backend/active_record/abstract_job.rb

@@ -6,7 +6,9 @@ module SwitchmanInstJobs
           module ClassMethods
             def current_switchman_shard
               connected_to_stack.reverse_each do |hash|
-                return hash[:switchman_shard] if hash[:switchman_shard] && hash[:klasses].include?(connection_classes)
+                if hash[:switchman_shard] && hash[:klasses].include?(connection_class_for_self)
+                  return hash[:switchman_shard]
+                end
               end
 
               ::ActiveRecord::Base.current_switchman_shard.delayed_jobs_shard

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

@@ -14,7 +14,7 @@ module SwitchmanInstJobs
         module ClassMethods
           def enqueue(object, **options)
             ::Switchman::Shard.periodic_clear_shard_cache
-            current_shard = ::Switchman::Shard.current
+            current_shard = options[:current_shard] || ::Switchman::Shard.current
             enqueue_options = options.merge(
               current_shard: current_shard
             )

data/lib/switchman_inst_jobs/delayed/message_sending.rb

@@ -4,6 +4,7 @@ module SwitchmanInstJobs
       def delay(sender: nil, synchronous: false, **enqueue_args)
         sender ||= __calculate_sender_for_delay
         synchronous ||= ::Switchman::DatabaseServer.creating_new_shard
+        enqueue_args[:current_shard] = ::Switchman::Shard.current
 
         super
       end

data/lib/switchman_inst_jobs/jobs_migrator.rb

@@ -127,7 +127,13 @@ module SwitchmanInstJobs
                   # the lock ensures the blocker always gets unlocked
                   first = value_scope.where.not(locked_by: nil).next_in_strand_order.lock.first
                   if first
-                    create_blocker_job(queue: first.queue, **{ column => value }, **blocker_job_kwargs)
+                    create_blocker_job(
+                      queue: first.queue,
+                      shard_id: first.shard_id,
+                      **{ column => value },
+                      **blocker_job_kwargs
+                    )
+
                     # the rest of 3) is taken care of here
                     # make sure that all the jobs moved over are NOT next in strand
                     ::Delayed::Job.where(next_in_strand: true, locked_by: nil, **{ column => value }).
@@ -160,12 +166,15 @@ module SwitchmanInstJobs
           locked_by: ::Delayed::Backend::Base::ON_HOLD_BLOCKER
         }
 
+        quoted_function_name = ::Delayed::Job.connection.quote_table_name('half_md5_as_bigint')
         strand_advisory_lock_fn = lambda do |value|
-          ::Delayed::Job.connection.execute("SELECT pg_advisory_xact_lock(half_md5_as_bigint('#{value}'))")
+          ::Delayed::Job.connection.execute("SELECT pg_advisory_xact_lock(#{quoted_function_name}('#{value}'))")
         end
 
         singleton_advisory_lock_fn = lambda do |value|
-          ::Delayed::Job.connection.execute("SELECT pg_advisory_xact_lock(half_md5_as_bigint('singleton:#{value}'))")
+          ::Delayed::Job.connection.execute(
+            "SELECT pg_advisory_xact_lock(#{quoted_function_name}('singleton:#{value}'))"
+          )
         end
 
         handler.call(strand_scope, :strand, {}, strand_advisory_lock_fn)

data/lib/switchman_inst_jobs/version.rb

@@ -1,3 +1,3 @@
 module SwitchmanInstJobs
-  VERSION = '4.0.5'.freeze
+  VERSION = '4.0.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.8
 platform: ruby
 authors:
 - Bryan Petty
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
@@ -53,7 +53,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,27 +63,35 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: switchman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -280,21 +288,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-description: 
+description:
 email:
 - bpetty@instructure.com
 executables: []
@@ -344,6 +338,8 @@ files:
 - db/migrate/20220128084800_update_insert_trigger_for_singleton_unique_constraint_change.rb
 - db/migrate/20220128084900_update_delete_trigger_for_singleton_unique_constraint_change.rb
 - 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
 - lib/switchman-inst-jobs.rb
 - lib/switchman_inst_jobs.rb
 - lib/switchman_inst_jobs/active_record/connection_adapters/postgresql_adapter.rb
@@ -371,7 +367,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -379,15 +375,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Switchman and Instructure Jobs compatibility gem.
 test_files: []