switchman-inst-jobs 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 711bf6fd7dfbea7baa7bf9f663264fdcfc37c3aa137d7b01f4c64985274dd045
-  data.tar.gz: 24955492cd97b95fbf3a8ab38c989fc40e0355751ddb43474c3c77b4839cdc43
+  metadata.gz: '08102eee5c1da6d032170565b624d61f90fcbc1c6232e1214babda846c9674c9'
+  data.tar.gz: 5f9c75d442f40b706dff2a45bfab8dc99ff8599470c096bbea594f1a763d7640
 SHA512:
-  metadata.gz: 8e498902747984003acc07838e7cc596cd06c1bc0e9d9f88d24fb01c2eeef8d952e47f1da8913b4bea759cb19dde0e5ee0b0cb1651cb2c07e9708a34cef4ecaf
-  data.tar.gz: 547333f01e1ec2aad62221c76702c33ce07b67009f2b584e0187d152ded1c468637514c3e401c83389898a24386c6c72d74ffb1c7b2e7e5e6a3b50591a3ebfa6
+  metadata.gz: 9118a73e2a47f1e6083737f967cc298674b8884c8cc23c9d16efff9e087951d63e54129f51a1c5595f2ec4cadb4332208a2a0262e7992b5777c39ac08ae8efa1
+  data.tar.gz: 791c382a9fbb141dc0e2f763b936d953bbd575ac01fc869a652628992c93b47c3cf93b590d95bd7867698c9410cbb278932ed1404e1e6d9f582cf00825cda8b0

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

@@ -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/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

data/lib/switchman_inst_jobs/jobs_migrator.rb

@@ -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 = '3.0.2'.freeze
+  VERSION = '3.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Bryan Petty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs