switchman-inst-jobs 1.3.5 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6175dabd6f8d0d343728a55d9cee438df89cdef4f3f71a17c9aeddd9e4f8cf54
-  data.tar.gz: 71281b6a418355f247d8bc9840be991eaff15939b4b48eb5766fe485dcb58d08
+  metadata.gz: 6ea858af15b508930d58fd21c5c097c4cedc0f244ef12f7d529120d79483322d
+  data.tar.gz: e431ab3d85859d0dc3acc5e95fbb820bc272c51bc4124615f0bc314c7d6f311a
 SHA512:
-  metadata.gz: dd79f316dd7b2dc21e754f8c7b2a42e01bfad995146ed32d28b23883d8e56aff32428046a9715970ca349357bacf6db5dfb9f250161c595d69c17405fbefd94f
-  data.tar.gz: f42b6c28e9956c4301e92d016d65fd69dfe1dc686d1754a4e1d94575987fd38024f35418f34a69029b539bfdc9ebce241c0fc84c88ff9739bb4649baecafde3c
+  metadata.gz: 263dc8ef6c816010d058a8033487a3ed89d6978accf1f16f73ebbc311ece6266f57333c80cf9a9f27d738359638e317e3179a2181d6940efbf8c522a02ba6a67
+  data.tar.gz: a7078f7f69c97e18cabbaa0ab3c4e1ef9df08472b29f2fe188cc83353b0759333e806a72e72bccdd6a635e642f75c5008092595be0ad3b6bbda114e27ce8723a

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

@@ -64,12 +64,14 @@ module SwitchmanInstJobs
 
         def deserialize(source)
           raise ShardNotFoundError, shard_id unless current_shard
+
           current_shard.activate { super }
         rescue ::Switchman::ConnectionError, PG::ConnectionBad, PG::UndefinedTable
           # likely a missing shard with a stale cache
           current_shard.send(:clear_cache)
           ::Switchman::Shard.clear_cache
           raise ShardNotFoundError, shard_id unless ::Switchman::Shard.where(id: shard_id).exists?
+
           raise
         end
       end

data/lib/switchman_inst_jobs/delayed/message_sending.rb

@@ -3,6 +3,7 @@ module SwitchmanInstJobs
     module MessageSending
       def send_later_enqueue_args(method, _enqueue_args = {}, *args)
         return send(method, *args) if ::Switchman::DatabaseServer.creating_new_shard
+
         super
       end
     end

data/lib/switchman_inst_jobs/delayed/worker/health_check.rb

@@ -20,17 +20,20 @@ module SwitchmanInstJobs
 
           def reschedule_abandoned_jobs(call_super: false)
             shards = ::Switchman::Shard.delayed_jobs_shards
-            call_super = true if shards.length == 1
-            if call_super
-              return munge_service_name(::Switchman::Shard.current(:delayed_jobs)) { super() }
+            call_super = shards.first if shards.length == 1
+            unless call_super == false
+              call_super.activate(:delayed_jobs) do
+                return munge_service_name(call_super) { super() }
+              end
             end
 
             ::Switchman::Shard.with_each_shard(shards, [:delayed_jobs], exception: :ignore) do
+              shard = ::Switchman::Shard.current(:delayed_jobs)
               singleton = <<~SINGLETON
-                periodic: Delayed::Worker::HealthCheck.reschedule_abandoned_jobs:#{::Switchman::Shard.current(:delayed_jobs).id}
+                periodic: Delayed::Worker::HealthCheck.reschedule_abandoned_jobs:#{shard.id}
               SINGLETON
               send_later_enqueue_args(
-                :reschedule_abandoned_jobs, { singleton: singleton }, call_super: true
+                :reschedule_abandoned_jobs, { singleton: singleton }, call_super: shard
               )
             end
           end

data/lib/switchman_inst_jobs/engine.rb

@@ -8,6 +8,14 @@ module SwitchmanInstJobs
 
     initializer 'sharding.delayed' do
       SwitchmanInstJobs.initialize_inst_jobs
+
+      ::Delayed::Worker.lifecycle.around(:work_queue_pop) do |worker, config, &block|
+        if config[:shard]
+          ::Switchman::Shard.lookup(config[:shard]).activate(:delayed_jobs) { block.call(worker, config) }
+        else
+          block.call(worker, config)
+        end
+      end
     end
 
     initializer 'sharding.shackles', after: 'switchman.extend_shackles' do

data/lib/switchman_inst_jobs/new_relic.rb

@@ -2,9 +2,7 @@ module SwitchmanInstJobs
   module NewRelic
     module FixNewRelicDelayedJobs
       module NewRelicJobInvoker
-        if defined?(::NewRelic)
-          include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
-        end
+        include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation if defined?(::NewRelic)
 
         def invoke_job(*args, &block)
           options = {

data/lib/switchman_inst_jobs/switchman/database_server.rb

@@ -3,12 +3,18 @@ module SwitchmanInstJobs
     module DatabaseServer
       def delayed_jobs_shard(shard = nil)
         return shard if config[:delayed_jobs_shard] == 'self'
+
         dj_shard =
           config[:delayed_jobs_shard] &&
           ::Switchman::Shard.lookup(config[:delayed_jobs_shard])
         # have to avoid recursion for the default shard asking for the default
         # shard's delayed_jobs_shard
-        dj_shard ||= shard if shard&.default?
+        if shard&.default?
+          # first look for any shard that behaves like a jobs shard
+          dj_shard ||= ::Switchman::Shard.delayed_jobs_shards.first
+          # we're really truly out of options, use the default shard itself
+          dj_shard ||= shard
+        end
         dj_shard ||= SwitchmanInstJobs.delayed_jobs_shard_fallback&.call(self, shard)
         dj_shard || ::Switchman::Shard.default.delayed_jobs_shard
       end

data/lib/switchman_inst_jobs/switchman/shard.rb

@@ -18,6 +18,11 @@ module SwitchmanInstJobs
       end
 
       module ClassMethods
+        def clear_cache
+          super
+          remove_instance_variable(:@delayed_jobs_shards) if instance_variable_defined?(:@delayed_jobs_shards)
+        end
+
         def current(category = :primary)
           if category == :delayed_jobs
             active_shards[category] || super(:primary).delayed_jobs_shard
@@ -53,19 +58,32 @@ module SwitchmanInstJobs
         end
 
         def delayed_jobs_shards
-          @delayed_jobs_shards ||= begin
-            db_dj_shards = ::Switchman::DatabaseServer.all.map do |db|
-              next db.shards.to_a if db.config[:delayed_jobs_shard] == 'self'
-              db.delayed_jobs_shard
-            end.compact.flatten.uniq # yes, all three
-            shard_dj_shards = ::Switchman::Shard
-              .where.not(delayed_jobs_shard_id: nil)
-              .distinct
-              .pluck(:delayed_jobs_shard_id)
-              .map { |id| ::Switchman::Shard.lookup(id) }
-              .compact
-            (db_dj_shards + shard_dj_shards).uniq.sort
+          unless instance_variable_defined?(:@delayed_jobs_shards)
+            # re-entrancy protection
+            @delayed_jobs_shards = begin
+              shard_dj_shards = [] unless ::Switchman::Shard.columns_hash.key?('delayed_jobs_shard_id')
+              shard_dj_shards ||= begin
+                ::Switchman::Shard
+                  .where.not(delayed_jobs_shard_id: nil)
+                  .distinct
+                  .pluck(:delayed_jobs_shard_id)
+                  .map { |id| ::Switchman::Shard.lookup(id) }
+                  .compact
+              end
+              # set it temporarily, to avoid the default shard falling back to itself
+              # if other shards are usable
+              @delayed_jobs_shards = shard_dj_shards.uniq.sort
+
+              db_dj_shards = ::Switchman::DatabaseServer.all.map do |db|
+                next db.shards.to_a if db.config[:delayed_jobs_shard] == 'self'
+
+                db.delayed_jobs_shard
+              end.compact.flatten.uniq # yes, all three
+
+              (db_dj_shards + shard_dj_shards).uniq.sort
+            end
           end
+          @delayed_jobs_shards
         end
       end
     end

data/lib/switchman_inst_jobs/version.rb

@@ -1,3 +1,3 @@
 module SwitchmanInstJobs
-  VERSION = '1.3.5'.freeze
+  VERSION = '1.4.3'.freeze
 end

data/lib/switchman_inst_jobs/yaml_extensions.rb

@@ -5,7 +5,7 @@ module SwitchmanInstJobs
         if object.tag == '!ruby/ActiveRecord:Switchman::Shard'
           ::Switchman::Shard.lookup(object.value) ||
             raise(Delayed::Backend::RecordNotFound,
-              "Couldn't find Switchman::Shard with id #{object.value.inspect}")
+                  "Couldn't find Switchman::Shard with id #{object.value.inspect}")
         else
           super
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.3
 platform: ruby
 authors:
 - Bryan Petty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-30 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '0.15'
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.16'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '0.15'
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.16'
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -56,20 +56,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.7
+        version: '1.14'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.7
+        version: '1.14'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -160,14 +160,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -202,42 +202,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: 0.79.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.79.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.4'
 description: 
 email:
 - bpetty@instructure.com
@@ -276,14 +290,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Switchman and Instructure Jobs compatibility gem.