Use a separate config option for concurrency maintenance task interval

rails · Nov 23, 2023 · ee5fcc6 · ee5fcc6
1 parent 93eb7f8
commit ee5fcc6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/lib/solid_queue/configuration.rb b/lib/solid_queue/configuration.rb
@@ -10,7 +10,8 @@ class Configuration
 
  SCHEDULER_DEFAULTS = {
  batch_size: 500,
- polling_interval: 300
+ polling_interval: 300,
+ concurrency_maintenance_interval: 600
  }
 
  def initialize(mode: :work, load_from: nil)

diff --git a/lib/solid_queue/scheduler.rb b/lib/solid_queue/scheduler.rb
@@ -4,7 +4,7 @@ module SolidQueue
  class Scheduler
  include Runner
 
- attr_accessor :batch_size, :polling_interval
+ attr_accessor :batch_size, :polling_interval, :concurrency_maintenance_interval
 
  set_callback :start, :before, :launch_concurrency_maintenance
  set_callback :shutdown, :before, :stop_concurrency_maintenance
@@ -14,6 +14,7 @@ def initialize(**options)
 
  @batch_size = options[:batch_size]
  @polling_interval = options[:polling_interval]
+ @concurrency_maintenance_interval = options[:concurrency_maintenance_interval]
  end
 
  private
@@ -33,7 +34,7 @@ def run
  end
 
  def launch_concurrency_maintenance
- @concurrency_maintenance_task = Concurrent::TimerTask.new(run_now: true, execution_interval: polling_interval) do
+ @concurrency_maintenance_task = Concurrent::TimerTask.new(run_now: true, execution_interval: concurrency_maintenance_interval) do
  expire_semaphores
  unblock_blocked_executions
  end

diff --git a/test/integration/concurrency_controls_test.rb b/test/integration/concurrency_controls_test.rb
@@ -10,7 +10,7 @@ class ConcurrencyControlsTest < ActiveSupport::TestCase
  @result = JobResult.create!(queue_name: "default", status: "seq: ")
 
  default_worker = { queues: "default", polling_interval: 1, processes: 3, threads: 2 }
- scheduler = { polling_interval: 1, batch_size: 200 }
+ scheduler = { polling_interval: 1, batch_size: 200, concurrency_maintenance_interval: 1 }
 
  @pid = run_supervisor_as_fork(mode: :all, load_configuration_from: { workers: [ default_worker ], scheduler: scheduler })