switchman-inst-jobs 3.2.8 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4023807a9b569aff8d1751ded026466f0e135b8eae0c6ad9ff7bd80a1a7f818
-  data.tar.gz: 8a61cde9444723e15b3ec0c6034791e1887972a572755fea1e72b87fe004ec7d
+  metadata.gz: ee1540b8c0c200ee917338953c9ea377dc0f32f354175e0e6953435861333c5f
+  data.tar.gz: 4e3912c490226c6f73c39d5923199e8d9cd661c8caeb6cef2fd6701b0dc5c08d
 SHA512:
-  metadata.gz: 0a947509044626f1ccebbd8c1ec34db74e0086dd3df8f8ef7a6b3dfbc6c616bb76a3832cf3a168191b954d1241586bacf8a7909bbeb3a7be1eec21eb3426865e
-  data.tar.gz: fb103f3ec6eff9c2b356f592f133c8eaae99b08487623b3d0aee257f1cb1215620d66824eb221ec745abc96e9c19fdcb5c254bd5bffec78bfcd283d9cd2b9745
+  metadata.gz: 6ee661bcf6f5335a5c6d4d7651936de85aedc6b01221700353b97c5bde61dc9a6c351948daaea70689e401962c4249efe56d359e377636dafafecb8d09ee4a49
+  data.tar.gz: 91b155c2f00a89298a7c9de0b1ec854119534e92ae6e7d89b3823adf666ba0fc9ca045c2a4e10e2e0a337c3eb3a8f1d775a6718ae9adde7d396ee787164e0596

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
@@ -25,8 +27,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
                 ::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
@@ -47,7 +49,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

@@ -13,10 +13,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 +45,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
@@ -72,7 +72,7 @@ module SwitchmanInstJobs
 
       def clear_shard_cache(debug_message = nil)
         ::Switchman.cache.clear
-        Rails.logger.debug("Waiting for caches to clear #{debug_message}")
+        Rails.logger.debug { "Waiting for caches to clear #{debug_message}" }
         # Wait a little over the 60 second in-process shard cache clearing
         # threshold to ensure that all new stranded jobs are now being
         # enqueued with next_in_strand: false
@@ -90,7 +90,7 @@ module SwitchmanInstJobs
       end
 
       def migrate_strands(batch_size: 1_000)
-        source_shard = ::Switchman::Shard.current(:delayed_jobs)
+        source_shard = ::Switchman::Shard.current(::Delayed::Backend::ActiveRecord::AbstractJob)
 
         # there are 4 scenarios to deal with here
         # 1) no running job, no jobs moved: do nothing
@@ -108,7 +108,7 @@ module SwitchmanInstJobs
             # 1) is taken care of because it should not show up here in strands
             values = shard_scope.distinct.order(column).pluck(column)
 
-            target_shard.activate(:delayed_jobs) do
+            target_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
               values.each do |value|
                 transaction_on([source_shard, target_shard]) do
                   value_scope = shard_scope.where(**{ column => value })
@@ -157,7 +157,7 @@ module SwitchmanInstJobs
 
         shard_map = build_shard_map(all_scope, source_shard)
         shard_map.each do |(target_shard, source_shard_ids)|
-          target_shard.activate(:delayed_jobs) do
+          target_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
             updated = ::Switchman::Shard.where(id: source_shard_ids, block_stranded: true).
               update_all(block_stranded: false)
             # If this is being manually re-run for some reason to clean something up, don't wait for nothing to happen
@@ -187,7 +187,7 @@ module SwitchmanInstJobs
               order(column, :strand_order_override, :id)).limit(batch_size)
         }
 
-        target_shard.activate(:delayed_jobs) do
+        target_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) 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
           # this target shard, so we shouldn't unlock them yet.  We only ever unlock one job here to keep the
@@ -206,8 +206,8 @@ module SwitchmanInstJobs
       end
 
       def migrate_everything(batch_size: 1_000)
-        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)|
@@ -253,16 +253,20 @@ module SwitchmanInstJobs
           # Adapted from get_and_lock_next_available in delayed/backend/active_record.rb
           target_jobs = scope.limit(batch_size).lock('FOR UPDATE SKIP LOCKED')
 
-          query = source_shard.activate(:delayed_jobs) 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)}, " \
-            "locked_at = #{::Delayed::Job.connection.quote(::Delayed::Job.db_time_now)} "\
-            "FROM limited_jobs WHERE limited_jobs.id=#{::Delayed::Job.quoted_table_name}.id " \
-            "RETURNING #{::Delayed::Job.quoted_table_name}.*"
+          query = source_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
+            <<~SQL
+              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)},
+              locked_at = #{::Delayed::Job.connection.quote(::Delayed::Job.db_time_now)}
+              FROM limited_jobs WHERE limited_jobs.id=#{::Delayed::Job.quoted_table_name}.id
+              RETURNING #{::Delayed::Job.quoted_table_name}.*
+            SQL
           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
@@ -280,10 +284,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

data/lib/switchman_inst_jobs/switchman/shard.rb

@@ -22,12 +22,12 @@ module SwitchmanInstJobs
       def hold_jobs!(wait: false)
         self.jobs_held = true
         save! if changed?
-        delayed_jobs_shard.activate(:delayed_jobs) do
+        delayed_jobs_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
           lock_jobs_for_hold
         end
         return unless wait
 
-        delayed_jobs_shard.activate(:delayed_jobs) do
+        delayed_jobs_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) 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?
@@ -47,7 +47,7 @@ module SwitchmanInstJobs
           Rails.logger.debug('Waiting for caches to clear')
           sleep(65)
         end
-        delayed_jobs_shard.activate(:delayed_jobs) do
+        delayed_jobs_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
           ::Delayed::Job.where(locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY, shard_id: id).
             in_batches(of: 10_000).
             update_all(
@@ -75,22 +75,14 @@ module SwitchmanInstJobs
           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
-          else
-            super
-          end
-        end
-
         def activate!(categories)
           if !@skip_delayed_job_auto_activation &&
-             !categories[:delayed_jobs] &&
-             categories[:primary] &&
-             categories[:primary] != active_shards[:primary]
+             !categories[::Delayed::Backend::ActiveRecord::AbstractJob] &&
+             categories[::ActiveRecord::Base] &&
+             categories[::ActiveRecord::Base] != ::Switchman::Shard.current(::ActiveRecord::Base)
             skip_delayed_job_auto_activation do
-              categories[:delayed_jobs] =
-                categories[:primary].delayed_jobs_shard
+              categories[::Delayed::Backend::ActiveRecord::AbstractJob] =
+                categories[::ActiveRecord::Base].delayed_jobs_shard
             end
           end
           super
@@ -104,11 +96,6 @@ module SwitchmanInstJobs
           @skip_delayed_job_auto_activation = was
         end
 
-        def create
-          db = ::Switchman::DatabaseServer.server_for_new_shard
-          db.create_new_shard
-        end
-
         def periodic_clear_shard_cache
           # TODO: make this configurable
           @timed_cache ||= TimedCache.new(-> { 60.to_i.seconds.ago }) do

data/lib/switchman_inst_jobs/version.rb

@@ -1,3 +1,3 @@
 module SwitchmanInstJobs
-  VERSION = '3.2.8'.freeze
+  VERSION = '4.0.4'.freeze
 end

data/lib/switchman_inst_jobs.rb

@@ -5,6 +5,9 @@ module SwitchmanInstJobs
   cattr_accessor :delayed_jobs_shard_fallback
 
   def self.initialize_active_record
+    ::ActiveRecord::ConnectionAdapters::ConnectionPool.prepend(
+      ActiveRecord::ConnectionAdapters::ConnectionPool
+    )
     ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(
       ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
     )
@@ -32,6 +35,7 @@ module SwitchmanInstJobs
   end
 end
 
+require 'switchman_inst_jobs/active_record/connection_adapters/connection_pool'
 require 'switchman_inst_jobs/active_record/connection_adapters/postgresql_adapter'
 require 'switchman_inst_jobs/active_record/migration'
 require 'switchman_inst_jobs/delayed/settings'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.2.8
+  version: 4.0.4
 platform: ruby
 authors:
 - Bryan Petty
@@ -50,34 +50,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: switchman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -110,16 +116,16 @@ dependencies:
   name: diplomat
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
   requirement: !ruby/object:Gem::Requirement
@@ -182,70 +188,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '2.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
@@ -289,6 +323,7 @@ files:
 - db/migrate/20151210162949_improve_max_concurrent.rb
 - db/migrate/20161206323555_add_back_default_string_limits_jobs.rb
 - db/migrate/20170308045400_add_shard_id_to_delayed_jobs.rb
+- db/migrate/20170308045401_add_delayed_jobs_shard_id_to_switchman_shards.rb
 - db/migrate/20181217155351_speed_up_max_concurrent_triggers.rb
 - db/migrate/20190726154743_make_critical_columns_not_null.rb
 - db/migrate/20200330230722_add_id_to_get_delayed_jobs_index.rb
@@ -311,6 +346,7 @@ files:
 - db/migrate/20220203063200_remove_old_singleton_index.rb
 - lib/switchman-inst-jobs.rb
 - lib/switchman_inst_jobs.rb
+- lib/switchman_inst_jobs/active_record/connection_adapters/connection_pool.rb
 - lib/switchman_inst_jobs/active_record/connection_adapters/postgresql_adapter.rb
 - lib/switchman_inst_jobs/active_record/migration.rb
 - lib/switchman_inst_jobs/delayed/backend/base.rb