switchman-inst-jobs 4.0.7 → 4.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae45b4d36d114de61b5363b41fc5f348be9fdf9afe9ecbdb3fdf0100516823b4
-  data.tar.gz: 0c59713f5158a5433fff01e20d95048407112c95a9314e94ad91a2062bd1affa
+  metadata.gz: 9f11936008b976dcf8421f1e8c232c04f70e9e1883c9aff5f2191d838bca2155
+  data.tar.gz: d43598b5e9998f83564282b7900c696fd815c55cd80088e14f60c14d1a01d850
 SHA512:
-  metadata.gz: f45f7ef1557d133f39d6ea813e5c387bb4e675ba47b18f9fbeef1abaa34876fba81b805a50183b8f22d650c6ca891d8def35b17557f95e5820809ceb50e1a3d3
-  data.tar.gz: 7c6bffe4777abfd8bf9cbece96ba3a24aad5df73421511ff4c9b5b4ed6345b722033a49095dd021d8ed50db1456567fc1a83eae3b9e02c658d0be09563deef39
+  metadata.gz: 0b00fb9a88dcec5e8c9d76175cb9de7194f107b98732cd27a46cfa63ecfd310d080055df26008f9301d16e9780e73ca6605e63ab30963d9a0753bd5b746fcf67
+  data.tar.gz: 5954e29022225b3f7dcf8c9f32c37f97cd0edc6db535753da7633f79167c72141fc96f479e9e334106540205eec91f0901344e0f369f98edec65638a21b9b621

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
             )
@@ -35,8 +35,10 @@ module SwitchmanInstJobs
                 enqueue_options[:next_in_strand] = false
               end
 
-              current_job_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
-                enqueue_job.call
+              current_shard.activate do
+                current_job_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
+                  enqueue_job.call
+                end
               end
             end
           end

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

@@ -39,7 +39,7 @@ module SwitchmanInstJobs
           updates[:updated_at] = Time.zone.now if ::Switchman::Shard.column_names.include?('updated_at')
           ::Switchman::Shard.where(id: shards).update_all(updates)
         end
-        clear_shard_cache
+        clear_shard_cache(default: ::Switchman::Shard.exists?(id: target_shards.values.flatten, default: true))
 
         ::Switchman::Shard.clear_cache
         # rubocop:disable Style/CombinableLoops
@@ -62,7 +62,7 @@ module SwitchmanInstJobs
         return unless shards.any?
 
         ::Switchman::Shard.where(id: shards).update_all(block_stranded: false)
-        clear_shard_cache
+        clear_shard_cache(default: shards.any?(&:default?))
 
         # shards is an array of shard objects that is now stale cause block_stranded has been updated.
         shards.map(&:delayed_jobs_shard).uniq.each do |dj_shard|
@@ -70,8 +70,9 @@ module SwitchmanInstJobs
         end
       end
 
-      def clear_shard_cache(debug_message = nil)
-        ::Switchman.cache.clear
+      def clear_shard_cache(debug_message = nil, default:)
+        ::Switchman.cache.delete_matched('shard/*')
+        ::Switchman.cache.delete('default_shard') if default
         Rails.logger.debug { "Waiting for caches to clear #{debug_message}" }
         # Wait a little over the 60 second in-process shard cache clearing
         # threshold to ensure that all new stranded jobs are now being
@@ -186,7 +187,11 @@ module SwitchmanInstJobs
             updated = ::Switchman::Shard.where(id: source_shard_ids, block_stranded: true).
               update_all(block_stranded: false)
             # If this is being manually re-run for some reason to clean something up, don't wait for nothing to happen
-            clear_shard_cache("(#{source_shard.id} -> #{target_shard.id})") unless updated.zero?
+            unless updated.zero?
+              clear_shard_cache("(#{source_shard.id} -> #{target_shard.id})",
+                                default: ::Switchman::Shard.exists?(id: source_shard_ids,
+                                                                    default: true))
+            end
 
             ::Switchman::Shard.clear_cache
             # At this time, let's unblock all the strands on the target shard that aren't being held by a blocker

data/lib/switchman_inst_jobs/version.rb

@@ -1,3 +1,3 @@
 module SwitchmanInstJobs
-  VERSION = '4.0.7'.freeze
+  VERSION = '4.0.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 4.0.7
+  version: 4.0.10
 platform: ruby
 authors:
 - Bryan Petty
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
@@ -288,7 +288,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
-description:
+description: 
 email:
 - bpetty@instructure.com
 executables: []
@@ -367,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
@@ -383,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Switchman and Instructure Jobs compatibility gem.
 test_files: []