switchman-inst-jobs 1.6.0 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e4c1c0421945fc0c823b2b1e452801565ac1c3e5ad9aae77d52fd8a36d83d0d
-  data.tar.gz: 87d5a191c8dd7c1918d1bae1d8b05ffdfee1146e462e9adab0869f2b2210f681
+  metadata.gz: '08102eee5c1da6d032170565b624d61f90fcbc1c6232e1214babda846c9674c9'
+  data.tar.gz: 5f9c75d442f40b706dff2a45bfab8dc99ff8599470c096bbea594f1a763d7640
 SHA512:
-  metadata.gz: a6c0abc940a6f4a7dc73923e9e020b853f23d29551bb19efa67338ae1e0da0af9065cde8f6a9f60e212f9514dd95c73b242512f1e21e53147601ff7f8cde30c1
-  data.tar.gz: 4caad338666dcfbb83967c007a28443a45f86aa813b8fa4f8d81f6354beb9e9f3b68ae7b4118afa5d40c6e2da77e34f7982c8e28a6c1de2e9cdcc99942acd2c4
+  metadata.gz: 9118a73e2a47f1e6083737f967cc298674b8884c8cc23c9d16efff9e087951d63e54129f51a1c5595f2ec4cadb4332208a2a0262e7992b5777c39ac08ae8efa1
+  data.tar.gz: 791c382a9fbb141dc0e2f763b936d953bbd575ac01fc869a652628992c93b47c3cf93b590d95bd7867698c9410cbb278932ed1404e1e6d9f582cf00825cda8b0

data/lib/switchman_inst_jobs.rb

@@ -25,8 +25,8 @@ module SwitchmanInstJobs
     ::Object.include Delayed::MessageSending
   end
 
-  def self.initialize_shackles
-    ::Shackles.singleton_class.prepend Shackles::ClassMethods
+  def self.initialize_guard_rail
+    ::GuardRail.singleton_class.prepend GuardRail::ClassMethods
   end
 
   def self.initialize_switchman
@@ -44,9 +44,9 @@ require 'switchman_inst_jobs/delayed/pool'
 require 'switchman_inst_jobs/delayed/worker'
 require 'switchman_inst_jobs/delayed/worker/health_check'
 require 'switchman_inst_jobs/engine'
+require 'switchman_inst_jobs/guard_rail'
 require 'switchman_inst_jobs/jobs_migrator'
 require 'switchman_inst_jobs/new_relic'
-require 'switchman_inst_jobs/shackles'
 require 'switchman_inst_jobs/switchman/database_server'
 require 'switchman_inst_jobs/switchman/default_shard'
 require 'switchman_inst_jobs/switchman/shard'

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

@@ -12,13 +12,13 @@ module SwitchmanInstJobs
     module Backend
       module Base
         module ClassMethods
-          def enqueue(object, options = {})
+          def enqueue(object, **options)
             ::Switchman::Shard.periodic_clear_shard_cache
             current_shard = ::Switchman::Shard.current
             enqueue_options = options.merge(
               current_shard: current_shard
             )
-            enqueue_job = -> { ::Shackles.activate(:master) { super(object, enqueue_options) } }
+            enqueue_job = -> { ::GuardRail.activate(:master) { super(object, **enqueue_options) } }
 
             # Another dj shard must be currently manually activated, so just use that
             # In general this will only happen in unusual circumstances like tests
@@ -43,8 +43,8 @@ module SwitchmanInstJobs
           end
 
           def configured_shard_ids
-            (::Delayed::Settings.worker_config.try(:[], 'workers') || [])
-              .map { |w| w['shard'] }.compact.uniq
+            (::Delayed::Settings.worker_config.try(:[], 'workers') || []).
+              map { |w| w['shard'] }.compact.uniq
           end
 
           def processes_locked_locally

data/lib/switchman_inst_jobs/delayed/message_sending.rb

@@ -1,8 +1,9 @@
 module SwitchmanInstJobs
   module Delayed
     module MessageSending
-      def send_later_enqueue_args(method, _enqueue_args = {}, *args)
-        return send(method, *args) if ::Switchman::DatabaseServer.creating_new_shard
+      def delay(sender: nil, synchronous: false, **enqueue_args)
+        sender ||= __calculate_sender_for_delay
+        synchronous ||= ::Switchman::DatabaseServer.creating_new_shard
 
         super
       end

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

@@ -19,7 +19,7 @@ module SwitchmanInstJobs
           end
 
           def reschedule_abandoned_jobs(call_super: false)
-            shards = ::Switchman::Shard.delayed_jobs_shards
+            shards = ::Switchman::Shard.delayed_jobs_shards.to_a
             call_super = shards.first if shards.length == 1
             unless call_super == false
               call_super.activate(:delayed_jobs) do
@@ -32,9 +32,7 @@ module SwitchmanInstJobs
               singleton = <<~SINGLETON
                 periodic: Delayed::Worker::HealthCheck.reschedule_abandoned_jobs:#{shard.id}
               SINGLETON
-              send_later_enqueue_args(
-                :reschedule_abandoned_jobs, { singleton: singleton }, call_super: shard
-              )
+              delay(singleton: singleton).reschedule_abandoned_jobs(call_super: shard)
             end
           end
         end

data/lib/switchman_inst_jobs/engine.rb

@@ -34,8 +34,8 @@ module SwitchmanInstJobs
       end
     end
 
-    initializer 'sharding.shackles', after: 'switchman.extend_shackles' do
-      SwitchmanInstJobs.initialize_shackles
+    initializer 'sharding.guard_rail', after: 'switchman.extend_guard_rail' do
+      SwitchmanInstJobs.initialize_guard_rail
     end
 
     initializer 'sharding.switchman' do

data/lib/switchman_inst_jobs/{shackles.rb → guard_rail.rb}

@@ -1,5 +1,5 @@
 module SwitchmanInstJobs
-  module Shackles
+  module GuardRail
     module ClassMethods
       def activate(env, &block)
         if ::ActiveRecord::Migration.open_migrations.positive?

data/lib/switchman_inst_jobs/jobs_migrator.rb

@@ -95,7 +95,7 @@ module SwitchmanInstJobs
                 first = this_strand_scope.where('locked_by IS NOT NULL').next_in_strand_order.lock.first
                 if first
                   first_job = ::Delayed::Job.create!(strand: strand, next_in_strand: false)
-                  first_job.payload_object = ::Delayed::PerformableMethod.new(Kernel, :sleep, [0])
+                  first_job.payload_object = ::Delayed::PerformableMethod.new(Kernel, :sleep, args: [0])
                   first_job.queue = first.queue
                   first_job.tag = 'Kernel.sleep'
                   first_job.source = 'JobsMigrator::StrandBlocker'
@@ -106,8 +106,8 @@ module SwitchmanInstJobs
                   first_job.save!
                   # 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, strand: strand, locked_by: nil)
-                    .update_all(next_in_strand: false)
+                  ::Delayed::Job.where(next_in_strand: true, strand: strand, locked_by: nil).
+                    update_all(next_in_strand: false)
                 end
 
                 # 4) is taken care of here, by leaveing next_in_strand alone and
@@ -136,10 +136,10 @@ module SwitchmanInstJobs
             # but actually could have run and we just didn't know it because we didn't know if they had jobs
             # on the source shard
             # rubocop:disable Layout/LineLength
-            strands_to_unblock = shard_scope.where.not(source: 'JobsMigrator::StrandBlocker')
-              .distinct
-              .where("NOT EXISTS (SELECT 1 FROM #{::Delayed::Job.quoted_table_name} dj2 WHERE delayed_jobs.strand=dj2.strand AND next_in_strand)")
-              .pluck(:strand)
+            strands_to_unblock = shard_scope.where.not(source: 'JobsMigrator::StrandBlocker').
+              distinct.
+              where("NOT EXISTS (SELECT 1 FROM #{::Delayed::Job.quoted_table_name} dj2 WHERE delayed_jobs.strand=dj2.strand AND next_in_strand)").
+              pluck(:strand)
             # rubocop:enable Layout/LineLength
             strands_to_unblock.each do |strand|
               Delayed::Job.where(strand: strand).next_in_strand_order.first.update_attribute(:next_in_strand, true)

data/lib/switchman_inst_jobs/switchman/database_server.rb

@@ -11,7 +11,7 @@ module SwitchmanInstJobs
         # shard's delayed_jobs_shard
         if shard&.default?
           # first look for any shard that behaves like a jobs shard
-          dj_shard ||= ::Switchman::Shard.delayed_jobs_shards.first
+          dj_shard ||= ::Switchman::Shard.delayed_jobs_shards.find(&:database_server)
           # we're really truly out of options, use the default shard itself
           dj_shard ||= shard
         end

data/lib/switchman_inst_jobs/switchman/shard.rb

@@ -28,9 +28,9 @@ module SwitchmanInstJobs
         return unless wait
 
         delayed_jobs_shard.activate(:delayed_jobs) do
-          while ::Delayed::Job.where(shard_id: id)
-              .where.not(locked_at: nil)
-              .where.not(locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY).exists?
+          while ::Delayed::Job.where(shard_id: id).
+              where.not(locked_at: nil).
+              where.not(locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY).exists?
             sleep 10
             lock_jobs_for_hold
           end
@@ -41,9 +41,9 @@ module SwitchmanInstJobs
         self.jobs_held = false
         save! if changed?
         delayed_jobs_shard.activate(:delayed_jobs) do
-          ::Delayed::Job.where(locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY, shard_id: id)
-            .in_batches(of: 10_000)
-            .update_all(
+          ::Delayed::Job.where(locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY, shard_id: id).
+            in_batches(of: 10_000).
+            update_all(
               locked_by: nil,
               locked_at: nil,
               attempts: 0,
@@ -111,32 +111,27 @@ module SwitchmanInstJobs
         end
 
         def delayed_jobs_shards
-          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
+          return none unless ::Switchman::Shard.columns_hash.key?('delayed_jobs_shard_id')
+
+          scope = ::Switchman::Shard.unscoped.
+            where(id: ::Switchman::Shard.unscoped.distinct.where.not(delayed_jobs_shard_id: nil).
+            select(:delayed_jobs_shard_id))
+          db_jobs_shards = ::Switchman::DatabaseServer.all.map { |db| db.config[:delayed_jobs_shard] }.uniq
+          db_jobs_shards.delete(nil)
+          has_self = db_jobs_shards.delete('self')
+          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)
+            scope = scope.or(::Switchman::Shard.unscoped.
+              where(id: ::Switchman::Shard.unscoped.where(delayed_jobs_shard_id: nil, database_server_id: self_dbs).
+              select(:id)))
           end
-          @delayed_jobs_shards
+          @jobs_scope_empty = !scope.exists? unless instance_variable_defined?(:@jobs_scope_empty)
+          return [::Switchman::Shard.default] if @jobs_scope_empty
+
+          ::Switchman::Shard.merge(scope)
         end
       end
     end

data/lib/switchman_inst_jobs/version.rb

@@ -1,3 +1,3 @@
 module SwitchmanInstJobs
-  VERSION = '1.6.0'.freeze
+  VERSION = '3.0.3'.freeze
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 3.0.3
 platform: ruby
 authors:
 - Bryan Petty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
-    - - "<"
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
-    - - "<"
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -68,22 +68,16 @@ dependencies:
   name: switchman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -174,14 +168,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -312,9 +306,9 @@ files:
 - lib/switchman_inst_jobs/delayed/worker.rb
 - lib/switchman_inst_jobs/delayed/worker/health_check.rb
 - lib/switchman_inst_jobs/engine.rb
+- lib/switchman_inst_jobs/guard_rail.rb
 - lib/switchman_inst_jobs/jobs_migrator.rb
 - lib/switchman_inst_jobs/new_relic.rb
-- lib/switchman_inst_jobs/shackles.rb
 - lib/switchman_inst_jobs/switchman/database_server.rb
 - lib/switchman_inst_jobs/switchman/default_shard.rb
 - lib/switchman_inst_jobs/switchman/shard.rb
@@ -333,14 +327,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 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.