switchman-inst-jobs 4.0.15 → 4.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e78746649c51edcf059596423923bc4f42422108877a1c7444aa7985c7a55065
-  data.tar.gz: c553969dbfb2b7bc796ad2b10c7589ef08fb063246601ad38a6484ab89486125
+  metadata.gz: ffde0df8a9f25e9d0feeb77a63670fbbfd0f9dd3a407ed1f6419070f66c2674f
+  data.tar.gz: c31ecdea96e9759783ce4f3683eb57f7f156bd68f053537063cb10a5d4351dc4
 SHA512:
-  metadata.gz: b95a14b6122193c204642643608a7355cbdb2abb69fec3471021788c31bcd0ffccd1d811f69b86a5a4cda47c7a43b25eb22a59d5f13a6d73bb07cadf659246a0
-  data.tar.gz: 693d7faaf636a13445c097d2faa0e5c45b0b1a31ed3245c0e43334f7dc19efd08bcc6491f1432e8afc17124edb433fc2cd06c61f9a4bf70ecb1e5f03e0d2b5ad
+  metadata.gz: 7b324b5616dfbd26e6af0c3ce2182f3a2fa66423eb672b842b51f19b9088be7befd31484d5e1290990506d6867471ea38e9d6303cf233538589c8c2c0626b9e2
+  data.tar.gz: 7c7e9928a25641dd790464a77d04078d467a006e30dcb6dfcce8b24860cb0f441273e164679d5cdc3d718b5b21ff225aee013c71716a599e3985aa09853a5931

data/lib/switchman_inst_jobs/delayed/pool.rb

@@ -3,8 +3,17 @@
 module SwitchmanInstJobs
   module Delayed
     module Pool
+      def initialize(*)
+        super
+
+        raise "Cannot run jobs cross-region" unless shards.all?(&:in_current_region?)
+      end
+
       def unlock_orphaned_jobs(worker = nil, pid = nil)
         if worker
+          # this is just a failsafe; it shouldn't be possible
+          return unless worker.shard.in_current_region?
+
           shards = [worker.shard]
         else
           # Since we're not unlocking for a specific worker, look through
@@ -19,13 +28,18 @@ module SwitchmanInstJobs
           # We purposely don't .compact to remove nils here, since if any
           # workers are on the default jobs shard we want to unlock against
           # that shard too.
-          shard_ids = @config[:workers].pluck(:shard).uniq
-          shards = shard_ids.map { |shard_id| ::Delayed::Worker.shard(shard_id) }
+
+          shards = self.shards.select(&:in_current_region?)
         end
         ::Switchman::Shard.with_each_shard(shards, [::Delayed::Backend::ActiveRecord::AbstractJob]) do
           super
         end
       end
+
+      def shards
+        shard_ids = @config[:workers].pluck(:shard).uniq
+        shard_ids.map { |shard_id| ::Delayed::Worker.shard(shard_id) }
+      end
     end
   end
 end

data/lib/switchman_inst_jobs/delayed/worker.rb

@@ -10,6 +10,9 @@ module SwitchmanInstJobs
       def initialize(options = {})
         # have to initialize this first, so #shard works
         @config = options
+        # this shouldn't be possible because of the pool check, but just in case
+        raise "Cannot run jobs cross-region" unless shard.in_current_region?
+
         ::Delayed::Worker::HealthCheck.munge_service_name(shard) do
           super
           # ensure we get our own copy of the munged config

data/lib/switchman_inst_jobs/switchman/shard.rb

@@ -120,8 +120,7 @@ module SwitchmanInstJobs
           scope = scope.or(::Switchman::Shard.unscoped.where(id: db_jobs_shards)) unless db_jobs_shards.empty?
 
           if has_self
-            self_dbs = ::Switchman::DatabaseServer.all
-                                                  .select { |db| db.config[:delayed_jobs_shard] == "self" }.map(&:id)
+            self_dbs = ::Switchman::DatabaseServer.select { |db| db.config[:delayed_jobs_shard] == "self" }.map(&:id)
             scope = scope.or(::Switchman::Shard.unscoped
               .where(id: ::Switchman::Shard.unscoped.where(delayed_jobs_shard_id: nil, database_server_id: self_dbs)
               .select(:id)))

data/lib/switchman_inst_jobs/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 4.0.15
+  version: 4.0.16
 platform: ruby
 authors:
 - Bryan Petty
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2023-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
@@ -71,6 +71,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -78,6 +81,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.14
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -274,7 +280,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
-description: 
+description:
 email:
 - bpetty@instructure.com
 executables: []
@@ -353,7 +359,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -368,8 +374,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Switchman and Instructure Jobs compatibility gem.
 test_files: []