switchman-inst-jobs 3.2.4 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14940745f93050077a1b203e0fe42aa6df0fb7ba8b4ffd79c009bddfec34012f
-  data.tar.gz: 1f98af701978926bd2d2d1e51889d322b578357ce2fd18fc2a6c95ebc6688a44
+  metadata.gz: 1e76d31061b35e05fb85de802c868f5244c386f39490b236b7e2fa48160c1b4d
+  data.tar.gz: 81d2c12f67012e962b7d45157f5df7f045a3f4f0c45df2c9294661125524f234
 SHA512:
-  metadata.gz: e181123386e69c8ac6756c97180e656e78ef32f706453352372f0592b16f1f95bd30d6c4ae4357c293d4739c8223d609630e5fe880460f51d06572567ef60b67
-  data.tar.gz: f4b541f47270c59db82e653055acd26c39161dd9a6c4866a8d7e1232484aeb592222c920cdd1b45914a8d08d53ef7369c20891c871bae290609c8f573faba9bc
+  metadata.gz: cb73f1c14a052801826a5f95cdfda52ecd73703cdc1b82b320a4b4ba69ba5ef2b4f77f01d41b1bec667df5b16a02529d8297f7de5726a392e65e086e0ad81570
+  data.tar.gz: 6b806f4e8e1e74e589090f75e54de9f12fe3e6ac5f97fc08296adc1c998055a082f7f815d0f7a6362d4745770e7791db100f640e6dadba5c8196ed0e940109b4

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
@@ -73,7 +74,7 @@ module SwitchmanInstJobs
           self.shard_id = shard.id
           self.shard_id = nil if shard.is_a?(::Switchman::DefaultShard)
           # If jobs are held for a shard, enqueue new ones as held as well
-          return unless ::Switchman::Shard.columns_hash.key?('jobs_held') && shard.jobs_held
+          return unless shard.jobs_held
 
           self.locked_by = ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY
           self.locked_at = ::Delayed::Job.db_time_now
@@ -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
@@ -23,8 +25,8 @@ module SwitchmanInstJobs
           ::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
+            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
@@ -43,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

data/lib/switchman_inst_jobs/jobs_migrator.rb

@@ -1,3 +1,7 @@
+# Just disabling all the rubocop metrics for this file for now,
+# as it is a direct port-in of existing code
+
+# rubocop:disable Metrics/BlockLength, Metrics/MethodLength, Metrics/AbcSize, Metrics/ClassLength
 require 'set'
 require 'parallel'
 
@@ -13,10 +17,10 @@ module SwitchmanInstJobs
         return yield if shards.empty?
 
         shard = shards.pop
-        current_shard = ::Switchman::Shard.current(:delayed_jobs)
-        shard.activate(:delayed_jobs) do
+        current_shard = ::Switchman::Shard.current(::Delayed::Backend::ActiveRecord::AbstractJob)
+        shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
           ::Delayed::Job.transaction do
-            current_shard.activate(:delayed_jobs) do
+            current_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
               transaction_on(shards, &block)
             end
           end
@@ -45,11 +49,11 @@ module SwitchmanInstJobs
         # rubocop:disable Style/CombinableLoops
         # We first migrate strands so that we can stop blocking strands before we migrate unstranded jobs
         source_shards.each do |s|
-          ::Switchman::Shard.lookup(s).activate(:delayed_jobs) { migrate_strands }
+          ::Switchman::Shard.lookup(s).activate(::Delayed::Backend::ActiveRecord::AbstractJob) { migrate_strands }
         end
 
         source_shards.each do |s|
-          ::Switchman::Shard.lookup(s).activate(:delayed_jobs) { migrate_everything }
+          ::Switchman::Shard.lookup(s).activate(::Delayed::Backend::ActiveRecord::AbstractJob) { migrate_everything }
         end
         ensure_unblock_stranded_for(shard_map.map(&:first))
         # rubocop:enable Style/CombinableLoops
@@ -99,7 +103,7 @@ module SwitchmanInstJobs
         # 4) no running job, jobs moved: set next_in_strand=true on the first of
         #    those (= do nothing since it should already be true)
 
-        source_shard = ::Switchman::Shard.current(:delayed_jobs)
+        source_shard = ::Switchman::Shard.current(::Delayed::Backend::ActiveRecord::AbstractJob)
         strand_scope = ::Delayed::Job.shard(source_shard).where.not(strand: nil)
         shard_map = build_shard_map(strand_scope, source_shard)
         shard_map.each do |(target_shard, source_shard_ids)|
@@ -108,7 +112,7 @@ module SwitchmanInstJobs
           # 1) is taken care of because it should not show up here in strands
           strands = shard_scope.distinct.order(:strand).pluck(:strand)
 
-          target_shard.activate(:delayed_jobs) do
+          target_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
             strands.each do |strand|
               transaction_on([source_shard, target_shard]) do
                 this_strand_scope = shard_scope.where(strand: strand)
@@ -167,7 +171,7 @@ module SwitchmanInstJobs
       end
 
       def unblock_strands(target_shard)
-        target_shard.activate(:delayed_jobs) do
+        target_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
           loop do
             # We only want to unlock stranded jobs where they don't belong to a blocked shard (if they *do* belong)
             # to a blocked shard, they must be part of a concurrent jobs migration from a different source shard to
@@ -186,8 +190,8 @@ module SwitchmanInstJobs
       end
 
       def migrate_everything
-        source_shard = ::Switchman::Shard.current(:delayed_jobs)
-        scope = ::Delayed::Job.shard(source_shard).where('strand IS NULL')
+        source_shard = ::Switchman::Shard.current(::Delayed::Backend::ActiveRecord::AbstractJob)
+        scope = ::Delayed::Job.shard(source_shard).where(strand: nil)
 
         shard_map = build_shard_map(scope, source_shard)
         shard_map.each do |(target_shard, source_shard_ids)|
@@ -220,7 +224,7 @@ module SwitchmanInstJobs
           # Adapted from get_and_lock_next_available in delayed/backend/active_record.rb
           target_jobs = scope.limit(1000).lock('FOR UPDATE SKIP LOCKED')
 
-          query = source_shard.activate(:delayed_jobs) do
+          query = source_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
             "WITH limited_jobs AS (#{target_jobs.to_sql}) " \
             "UPDATE #{::Delayed::Job.quoted_table_name} " \
             "SET locked_by = #{::Delayed::Job.connection.quote(::Delayed::Backend::Base::ON_HOLD_LOCKED_BY)}, " \
@@ -229,7 +233,9 @@ module SwitchmanInstJobs
             "RETURNING #{::Delayed::Job.quoted_table_name}.*"
           end
 
-          jobs = source_shard.activate(:delayed_jobs) { ::Delayed::Job.find_by_sql(query) }
+          jobs = source_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
+            ::Delayed::Job.find_by_sql(query)
+          end
           new_jobs = jobs.map do |job|
             new_job = job.dup
             new_job.shard = target_shard
@@ -247,10 +253,10 @@ module SwitchmanInstJobs
             new_job
           end
           transaction_on([source_shard, target_shard]) do
-            target_shard.activate(:delayed_jobs) do
+            target_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
               bulk_insert_jobs(new_jobs)
             end
-            source_shard.activate(:delayed_jobs) do
+            source_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
               ::Delayed::Job.delete(jobs)
             end
           end
@@ -277,10 +283,7 @@ module SwitchmanInstJobs
         connection = ::Delayed::Job.connection
         quoted_keys = keys.map { |k| connection.quote_column_name(k) }.join(', ')
 
-        connection.execute 'DROP TABLE IF EXISTS delayed_jobs_bulk_copy'
-        connection.execute "CREATE TEMPORARY TABLE delayed_jobs_bulk_copy
-          (LIKE #{::Delayed::Job.quoted_table_name} INCLUDING DEFAULTS)"
-        connection.execute "COPY delayed_jobs_bulk_copy (#{quoted_keys}) FROM STDIN"
+        connection.execute "COPY #{::Delayed::Job.quoted_table_name} (#{quoted_keys}) FROM STDIN"
         records.map do |record|
           connection.raw_connection.put_copy_data("#{keys.map { |k| quote_text(record[k]) }.join("\t")}\n")
         end
@@ -292,9 +295,6 @@ module SwitchmanInstJobs
         rescue StandardError => e
           raise connection.send(:translate_exception, e, 'COPY FROM STDIN')
         end
-        connection.execute "INSERT INTO #{::Delayed::Job.quoted_table_name} (#{quoted_keys})
-          SELECT #{quoted_keys} FROM delayed_jobs_bulk_copy
-          ON CONFLICT (singleton) WHERE singleton IS NOT NULL AND locked_by IS NULL DO NOTHING"
         result.cmd_tuples
       end
 
@@ -312,3 +312,5 @@ module SwitchmanInstJobs
     end
   end
 end
+
+# rubocop:enable Metrics/BlockLength, Metrics/MethodLength, Metrics/AbcSize, Metrics/ClassLength