switchman-inst-jobs 4.0.9 → 4.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6453b4fb5882411028c48e458ec49ee8dd14686b6baa889053bdc44c0f43ecc
-  data.tar.gz: b5883129b65be01ce10acdb373bdd8bcc95c76e8a18eb4326cb2590b71ead518
+  metadata.gz: 9f11936008b976dcf8421f1e8c232c04f70e9e1883c9aff5f2191d838bca2155
+  data.tar.gz: d43598b5e9998f83564282b7900c696fd815c55cd80088e14f60c14d1a01d850
 SHA512:
-  metadata.gz: adc1ed9eb64a227ecbe46f98f92e6b357c595249ad681a4dd3b649fade15b5848ebb4cf15feca35b49ca2c312abe31ef3357941f666be11ad554a1f5cc37892c
-  data.tar.gz: f0d8cd82e01d15b698f57417f2b2d88cb0263bbd47cfba167a812158f89a5110e653590b3e125f65c5555e3f580f346bbf5f1de9b0a58cc8f951bd326d348e9e
+  metadata.gz: 0b00fb9a88dcec5e8c9d76175cb9de7194f107b98732cd27a46cfa63ecfd310d080055df26008f9301d16e9780e73ca6605e63ab30963d9a0753bd5b746fcf67
+  data.tar.gz: 5954e29022225b3f7dcf8c9f32c37f97cd0edc6db535753da7633f79167c72141fc96f479e9e334106540205eec91f0901344e0f369f98edec65638a21b9b621

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.9'.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.9
+  version: 4.0.10
 platform: ruby
 authors:
 - Bryan Petty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-29 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs