switchman-inst-jobs 3.2.10 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7c79b622db6622d52f9fa4bc58b4b4bcd199ac246c93af1330b93f724ecec6b
-  data.tar.gz: efa9db49c224a20c03cdb28e4c97b4071864bb8b2d7efd6c16469eeb6a32544a
+  metadata.gz: e6f9f61d51da46ec92185649cc434d9168740c491ade56179d13537d9552fa8b
+  data.tar.gz: 5c53dbe8087c254444f995ee738cb4164db03fc8a91ae823938a13b372e3eb0d
 SHA512:
-  metadata.gz: 3978fd1d2abc5f0adda8caeb77891153eda538e470712a2472268b104e989c573851a110db6a1e60c894a95b21ba66a348b403dcab68684e762765b8952729b8
-  data.tar.gz: 67dfe54fc06dcf591b129d6aeda70c9019400696a3052b12e43d043a943dcd2db52f962de05acc45125e6f2824d99d9d9c72e6db4232b31adcaf9c3c1ade0512
+  metadata.gz: 44c3483d276b435c93abc3547b458cde60739b9a4843465541065ae5d71eb8dcee9d2c4ebebf8b1fe4fc31fd6c7951f983d8af76c44a340e7e29ce811466778f
+  data.tar.gz: 0acdee9429002d28e9368bf29fce1b64fa492132f43b8ff884bca36f5b5aded965343a621c2e61b07de7bd18dcc059b5e11d1a8571a8319a0582d9dc8e1fa206

data/db/migrate/20101216224513_create_delayed_jobs.rb

@@ -1,6 +1,6 @@
 class CreateDelayedJobs < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Backend::ActiveRecord::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20110208031356_add_delayed_jobs_tag.rb

@@ -1,6 +1,6 @@
 class AddDelayedJobsTag < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Backend::ActiveRecord::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20110426161613_add_delayed_jobs_max_attempts.rb

@@ -1,6 +1,6 @@
 class AddDelayedJobsMaxAttempts < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Backend::ActiveRecord::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20110516225834_add_delayed_jobs_strand.rb

@@ -1,6 +1,6 @@
 class AddDelayedJobsStrand < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Backend::ActiveRecord::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20110531144916_cleanup_delayed_jobs_indexes.rb

@@ -1,6 +1,6 @@
 class CleanupDelayedJobsIndexes < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Backend::ActiveRecord::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20110610213249_optimize_delayed_jobs.rb

@@ -1,6 +1,6 @@
 class OptimizeDelayedJobs < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Backend::ActiveRecord::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20110831210257_add_delayed_jobs_next_in_strand.rb

@@ -1,6 +1,6 @@
 class AddDelayedJobsNextInStrand < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Backend::ActiveRecord::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20120510004759_delayed_jobs_delete_trigger_lock_for_update.rb

@@ -1,6 +1,6 @@
 class DelayedJobsDeleteTriggerLockForUpdate < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Backend::ActiveRecord::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20120531150712_drop_psql_jobs_pop_fn.rb

@@ -1,6 +1,6 @@
 class DropPsqlJobsPopFn < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Backend::ActiveRecord::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20120607164022_delayed_jobs_use_advisory_locks.rb

@@ -1,6 +1,6 @@
 class DelayedJobsUseAdvisoryLocks < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Backend::ActiveRecord::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20120607181141_index_jobs_on_locked_by.rb

@@ -1,8 +1,8 @@
 class IndexJobsOnLockedBy < ActiveRecord::Migration[4.2]
-  disable_ddl_transaction! if respond_to?(:disable_ddl_transaction!)
+  disable_ddl_transaction!
 
   def connection
-    Delayed::Backend::ActiveRecord::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20120608191051_add_jobs_run_at_index.rb

@@ -1,8 +1,8 @@
 class AddJobsRunAtIndex < ActiveRecord::Migration[4.2]
-  disable_ddl_transaction! if respond_to?(:disable_ddl_transaction!)
+  disable_ddl_transaction!
 
   def connection
-    Delayed::Backend::ActiveRecord::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20120927184213_change_delayed_jobs_handler_to_text.rb

@@ -1,6 +1,6 @@
 class ChangeDelayedJobsHandlerToText < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20140505215131_add_failed_jobs_original_job_id.rb

@@ -1,6 +1,6 @@
 class AddFailedJobsOriginalJobId < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Backend::ActiveRecord::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20140505215510_copy_failed_jobs_original_id.rb

@@ -1,11 +1,11 @@
 class CopyFailedJobsOriginalId < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Backend::ActiveRecord::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up
     # this is a smaller, less frequently accessed table, so we just update all at once
-    Delayed::Backend::ActiveRecord::Job::Failed.where('original_job_id is null').update_all('original_job_id = original_id')
+    Delayed::Backend::ActiveRecord::Job::Failed.where(original_job_id: nil).update_all('original_job_id = original_id')
   end
 
   def down; end

data/db/migrate/20140505223637_drop_failed_jobs_original_id.rb

@@ -1,6 +1,6 @@
 class DropFailedJobsOriginalId < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Backend::ActiveRecord::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20140512213941_add_source_to_jobs.rb

@@ -1,6 +1,6 @@
 class AddSourceToJobs < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20150807133223_add_max_concurrent_to_jobs.rb

@@ -1,6 +1,6 @@
 class AddMaxConcurrentToJobs < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20151123210429_add_expires_at_to_jobs.rb

@@ -1,6 +1,6 @@
 class AddExpiresAtToJobs < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20151210162949_improve_max_concurrent.rb

@@ -1,6 +1,6 @@
 class ImproveMaxConcurrent < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20161206323555_add_back_default_string_limits_jobs.rb

@@ -1,6 +1,6 @@
 class AddBackDefaultStringLimitsJobs < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20170308045400_add_shard_id_to_delayed_jobs.rb

@@ -2,7 +2,7 @@ class AddShardIdToDelayedJobs < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def connection
-    Delayed::Backend::ActiveRecord::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up
@@ -11,19 +11,9 @@ class AddShardIdToDelayedJobs < ActiveRecord::Migration[4.2]
 
     add_column :failed_jobs, :shard_id, :integer, limit: 8
     add_index :failed_jobs, :shard_id, algorithm: :concurrently
-
-    add_column :switchman_shards, :delayed_jobs_shard_id, :integer, limit: 8
-    add_foreign_key(
-      :switchman_shards,
-      :switchman_shards,
-      column: :delayed_jobs_shard_id
-    )
   end
 
   def down
-    remove_foreign_key :switchman_shards, column: :delayed_jobs_shard_id
-    remove_column :switchman_shards, :delayed_jobs_shard_id
-
     remove_index :failed_jobs, :shard_id
     remove_column :failed_jobs, :shard_id
 

data/db/migrate/20170308045401_add_delayed_jobs_shard_id_to_switchman_shards.rb

@@ -0,0 +1,5 @@
+class AddDelayedJobsShardIdToSwitchmanShards < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :switchman_shards, :delayed_jobs_shard, foreign_key: { to_table: :switchman_shards }, index: false, if_not_exists: true
+  end
+end

data/db/migrate/20181217155351_speed_up_max_concurrent_triggers.rb

@@ -1,6 +1,6 @@
 class SpeedUpMaxConcurrentTriggers < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20190726154743_make_critical_columns_not_null.rb

@@ -1,6 +1,6 @@
 class MakeCriticalColumnsNotNull < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20200330230722_add_id_to_get_delayed_jobs_index.rb

@@ -1,8 +1,8 @@
 class AddIdToGetDelayedJobsIndex < ActiveRecord::Migration[4.2]
-  disable_ddl_transaction! if respond_to?(:disable_ddl_transaction!)
+  disable_ddl_transaction!
 
   def connection
-    Delayed::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20200824222232_speed_up_max_concurrent_delete_trigger.rb

@@ -1,6 +1,6 @@
 class SpeedUpMaxConcurrentDeleteTrigger < ActiveRecord::Migration[4.2]
   def connection
-    Delayed::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/db/migrate/20200825011002_add_strand_order_override.rb

@@ -1,8 +1,8 @@
 class AddStrandOrderOverride < ActiveRecord::Migration[4.2]
-  disable_ddl_transaction! if respond_to?(:disable_ddl_transaction!)
+  disable_ddl_transaction!
 
   def connection
-    Delayed::Job.connection
+    Delayed::Backend::ActiveRecord::AbstractJob.connection
   end
 
   def up

data/lib/switchman_inst_jobs/active_record/connection_adapters/connection_pool.rb

@@ -0,0 +1,15 @@
+module SwitchmanInstJobs
+  module ActiveRecord
+    module ConnectionAdapters
+      module ConnectionPool
+        def shard
+          if connection_klass == ::Delayed::Backend::ActiveRecord::AbstractJob
+            return shard_stack.last || ::Switchman::Shard.current(::ActiveRecord::Base).delayed_jobs_shard
+          end
+
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -24,19 +24,18 @@ module SwitchmanInstJobs
             # In general this will only happen in unusual circumstances like tests
             # also if migrations are running, always use the current shard's job shard
             if ::ActiveRecord::Migration.open_migrations.zero? &&
-               current_shard.delayed_jobs_shard != ::Switchman::Shard.current(:delayed_jobs)
+               current_shard.delayed_jobs_shard !=
+               ::Switchman::Shard.current(::Delayed::Backend::ActiveRecord::AbstractJob)
               enqueue_job.call
             else
-              ::Switchman::Shard.default.activate do
-                current_shard = ::Switchman::Shard.lookup(current_shard.id)
-              end
+              current_shard = ::Switchman::Shard.lookup(current_shard.id)
               current_job_shard = current_shard.delayed_jobs_shard
 
               if (options[:singleton] || options[:strand]) && current_shard.block_stranded
                 enqueue_options[:next_in_strand] = false
               end
 
-              current_job_shard.activate(:delayed_jobs) do
+              current_job_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
                 enqueue_job.call
               end
             end
@@ -50,7 +49,7 @@ module SwitchmanInstJobs
             shard_ids = configured_shard_ids
             if shard_ids.any?
               shards = shard_ids.map { |shard_id| ::Delayed::Worker.shard(shard_id) }
-              ::Switchman::Shard.with_each_shard(shards, [:delayed_jobs]) do
+              ::Switchman::Shard.with_each_shard(shards, [::Delayed::Backend::ActiveRecord::AbstractJob]) do
                 super
               end
             else
@@ -61,7 +60,9 @@ module SwitchmanInstJobs
 
         def self.prepended(base)
           base.singleton_class.prepend(ClassMethods)
-          base.shard_category = :delayed_jobs if base.name == 'Delayed::Backend::ActiveRecord::Job'
+          return unless base.name == 'Delayed::Backend::ActiveRecord::Job'
+
+          ::Delayed::Backend::ActiveRecord::AbstractJob.sharded_model
         end
 
         def current_shard
@@ -90,7 +91,7 @@ module SwitchmanInstJobs
           raise ShardNotFoundError, shard_id unless current_shard
 
           current_shard.activate { super }
-        rescue ::Switchman::ConnectionError, PG::ConnectionBad, PG::UndefinedTable
+        rescue PG::ConnectionBad, PG::UndefinedTable
           # likely a missing shard with a stale cache
           current_shard.send(:clear_cache)
           ::Switchman::Shard.clear_cache

data/lib/switchman_inst_jobs/delayed/pool.rb

@@ -20,7 +20,7 @@ module SwitchmanInstJobs
           shard_ids = @config[:workers].pluck(:shard).uniq
           shards = shard_ids.map { |shard_id| ::Delayed::Worker.shard(shard_id) }
         end
-        ::Switchman::Shard.with_each_shard(shards, [:delayed_jobs]) do
+        ::Switchman::Shard.with_each_shard(shards, [::Delayed::Backend::ActiveRecord::AbstractJob]) do
           super
         end
       end

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

@@ -21,18 +21,16 @@ module SwitchmanInstJobs
           def reschedule_abandoned_jobs
             shard_ids = ::SwitchmanInstJobs::Delayed::Settings.configured_shard_ids
             shards = shard_ids.map { |shard_id| ::Delayed::Worker.shard(shard_id) }
-            ::Switchman::Shard.with_each_shard(shards, [:delayed_jobs]) do
-              dj_shard = ::Switchman::Shard.current(:delayed_jobs)
-              dj_shard.activate do
-                munge_service_name(dj_shard) do
-                  # because this rescheduling process is running on every host, we need
-                  # to make sure that it's functioning for each shard the current
-                  # host is programmed to interact with, but ONLY for those shards.
-                  # reading the config lets us iterate over any shards this host should
-                  # work with and lets us pick the correct service name to identify which
-                  # hosts are currently alive and valid via the health checks
-                  super()
-                end
+            ::Switchman::Shard.with_each_shard(shards,
+                                               [::ActiveRecord::Base, ::Delayed::Backend::ActiveRecord::AbstractJob]) do
+              munge_service_name(::Switchman::Shard.current) do
+                # because this rescheduling process is running on every host, we need
+                # to make sure that it's functioning for each shard the current
+                # host is programmed to interact with, but ONLY for those shards.
+                # reading the config lets us iterate over any shards this host should
+                # work with and lets us pick the correct service name to identify which
+                # hosts are currently alive and valid via the health checks
+                super()
               end
             end
           end

data/lib/switchman_inst_jobs/delayed/worker.rb

@@ -16,14 +16,14 @@ module SwitchmanInstJobs
       end
 
       def start
-        shard.activate(:delayed_jobs) { super }
+        shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) { super }
       end
 
       # Worker#run is usually only called from Worker#start, but if the worker
       # is called directly from the console, we want to make sure it still gets
       # the right shard activated.
       def run
-        shard.activate(:delayed_jobs) { super }
+        shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) { super }
       end
 
       def shard

data/lib/switchman_inst_jobs/engine.rb

@@ -11,7 +11,9 @@ module SwitchmanInstJobs
 
       ::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) }
+          ::Switchman::Shard.lookup(config[:shard]).activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
+            block.call(worker, config)
+          end
         else
           block.call(worker, config)
         end
@@ -19,17 +21,13 @@ module SwitchmanInstJobs
 
       # Ensure jobs get unblocked on the new shard if they exist
       ::Delayed::Worker.lifecycle.after(:perform) do |_worker, job|
-        if job.strand || job.singleton
-          column = job.strand ? :strand : :singleton
-
+        if job.strand
           ::Switchman::Shard.clear_cache
           ::Switchman::Shard.default.activate do
             current_job_shard = ::Switchman::Shard.lookup(job.shard_id).delayed_jobs_shard
-            if current_job_shard != ::Switchman::Shard.current(:delayed_jobs)
-              current_job_shard.activate(:delayed_jobs) do
-                ::Delayed::Job.where(source: 'JobsMigrator::StrandBlocker', **{ column => job.try(column) }).delete_all
-
-                j = ::Delayed::Job.where(**{ column => job.try(column) }).next_in_strand_order.first
+            if current_job_shard != ::Switchman::Shard.current(::Delayed::Backend::ActiveRecord::AbstractJob)
+              current_job_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
+                j = ::Delayed::Job.where(strand: job.strand).next_in_strand_order.first
                 j.update_column(:next_in_strand, true) if j && !j.next_in_strand
               end
             end
@@ -47,7 +45,7 @@ module SwitchmanInstJobs
     end
 
     config.after_initialize do
-      ::Switchman::Shard.default.delayed_jobs_shard.activate!(:delayed_jobs)
+      ::Switchman::Shard.default.delayed_jobs_shard.activate!(::Delayed::Backend::ActiveRecord::AbstractJob)
     end
   end
 end