Merge branch 'main' into aaa/health_server

faraquet · web-flow · commit ed163981ef4e · 2025-10-29T19:03:26.000Z
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,10 +29,12 @@ jobs:
         - 3.3
         - 3.4
         database: [ mysql, postgres, sqlite ]
-        gemfile: [ rails_7_1, rails_7_2, rails_8_0, rails_main ]
+        gemfile: [ rails_7_1, rails_7_2, rails_8_0, rails_8_1, rails_main ]
         exclude:
           - ruby-version: "3.1"
             gemfile: rails_8_0
+          - ruby-version: "3.1"
+            gemfile: rails_8_1
           - ruby-version: "3.1"
             gemfile: rails_main
     services:
@@ -77,4 +79,4 @@ jobs:
           path: |
             test/dummy/log/test.log
           if-no-files-found: ignore
-          retention-days: 7
+          retention-days: 30
diff --git a/Appraisals b/Appraisals
@@ -15,6 +15,10 @@ appraise "rails-8-0" do
   gem "railties", "~> 8.0.0"
 end
 
+appraise "rails-8-1" do
+  gem "railties", "~> 8.1.0"
+end
+
 appraise "rails-main" do
   gem "railties", github: "rails/rails", branch: "main"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    solid_queue (1.2.2)
+    solid_queue (1.2.3)
       activejob (>= 7.1)
       activerecord (>= 7.1)
       concurrent-ruby (>= 1.3.1)
diff --git a/Rakefile b/Rakefile
@@ -5,7 +5,9 @@ require "bundler/setup"
 APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
 load "rails/tasks/engine.rake"
 
-load "rails/tasks/statistics.rake"
+if Rails::VERSION::MAJOR < 8
+  load "rails/tasks/statistics.rake"
+end
 
 require "bundler/gem_tasks"
 require "rake/tasklib"
diff --git a/gemfiles/rails_8_1.gemfile b/gemfiles/rails_8_1.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "railties", "~> 8.1.0"
+
+gemspec path: "../"
diff --git a/lib/solid_queue/configuration.rb b/lib/solid_queue/configuration.rb
@@ -222,6 +222,7 @@ def load_config_from_file(file)
         if file.exist?
           ActiveSupport::ConfigurationFile.parse(file).deep_symbolize_keys
         else
+          puts "[solid_queue] WARNING: Provided configuration file '#{file}' does not exist. Falling back to default configuration."
           {}
         end
       end
diff --git a/lib/solid_queue/processes/registrable.rb b/lib/solid_queue/processes/registrable.rb
@@ -18,17 +18,19 @@ def process_id
       attr_accessor :process
 
       def register
-        @process = SolidQueue::Process.register \
-          kind: kind,
-          name: name,
-          pid: pid,
-          hostname: hostname,
-          supervisor: try(:supervisor),
-          metadata: metadata.compact
+        wrap_in_app_executor do
+          @process = SolidQueue::Process.register \
+            kind: kind,
+            name: name,
+            pid: pid,
+            hostname: hostname,
+            supervisor: try(:supervisor),
+            metadata: metadata.compact
+        end
       end
 
       def deregister
-        process&.deregister
+        wrap_in_app_executor { process&.deregister }
       end
 
       def registered?
diff --git a/lib/solid_queue/scheduler/recurring_schedule.rb b/lib/solid_queue/scheduler/recurring_schedule.rb
@@ -46,7 +46,7 @@ def persist_tasks
       end
 
       def reload_tasks
-        @configured_tasks = SolidQueue::RecurringTask.where(key: task_keys)
+        @configured_tasks = SolidQueue::RecurringTask.where(key: task_keys).to_a
       end
 
       def schedule(task)
diff --git a/lib/solid_queue/supervisor.rb b/lib/solid_queue/supervisor.rb
@@ -29,22 +29,18 @@ def initialize(configuration)
     end
 
     def start
-      wrap_in_app_executor do
-        boot
-        run_start_hooks
+      boot
+      run_start_hooks
 
-        start_processes
-        launch_maintenance_task
+      start_processes
+      launch_maintenance_task
 
-        supervise
-      end
+      supervise
     end
 
     def stop
-      wrap_in_app_executor do
-        super
-        run_stop_hooks
-      end
+      super
+      run_stop_hooks
     end
 
     private
@@ -180,9 +176,11 @@ def replace_fork(pid, status)
       # executions it had claimed as failed so that they can be retried
       # by some other worker.
       def handle_claimed_jobs_by(terminated_fork, status)
-        if registered_process = SolidQueue::Process.find_by(name: terminated_fork.name)
-          error = Processes::ProcessExitError.new(status)
-          registered_process.fail_all_claimed_executions_with(error)
+        wrap_in_app_executor do
+          if registered_process = SolidQueue::Process.find_by(name: terminated_fork.name)
+            error = Processes::ProcessExitError.new(status)
+            registered_process.fail_all_claimed_executions_with(error)
+          end
         end
       end
 
diff --git a/lib/solid_queue/version.rb b/lib/solid_queue/version.rb
@@ -1,3 +1,3 @@
 module SolidQueue
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end
diff --git a/test/integration/concurrency_controls_test.rb b/test/integration/concurrency_controls_test.rb
@@ -36,14 +36,16 @@ class ConcurrencyControlsTest < ActiveSupport::TestCase
   end
 
   test "schedule several conflicting jobs over the same record sequentially" do
-    UpdateResultJob.set(wait: 0.23.seconds).perform_later(@result, name: "000", pause: 0.1.seconds)
+    # Writes to @result at 0.4s
+    UpdateResultJob.set(wait: 0.2.seconds).perform_later(@result, name: "000", pause: 0.2.seconds)
 
     ("A".."F").each_with_index do |name, i|
-      NonOverlappingUpdateResultJob.set(wait: (0.2 + i * 0.01).seconds).perform_later(@result, name: name, pause: 0.3.seconds)
+      # "A" is enqueued at 0.2s and writes to @result at 0.6s, the write at 0.4s gets overwritten
+      NonOverlappingUpdateResultJob.set(wait: (0.2 + i * 0.1).seconds).perform_later(@result, name: name, pause: 0.4.seconds)
     end
 
     ("G".."K").each_with_index do |name, i|
-      NonOverlappingUpdateResultJob.set(wait: (0.3 + i * 0.01).seconds).perform_later(@result, name: name)
+      NonOverlappingUpdateResultJob.set(wait: (1 + i * 0.1).seconds).perform_later(@result, name: name)
     end
 
     wait_for_jobs_to_finish_for(5.seconds)
diff --git a/test/integration/processes_lifecycle_test.rb b/test/integration/processes_lifecycle_test.rb
@@ -182,12 +182,6 @@ class ProcessesLifecycleTest < ActiveSupport::TestCase
     assert_completed_job_results("no exit", :background, 4)
     assert_completed_job_results("paused no exit", :default, 1)
 
-    # The background worker exits because of the exit job,
-    # leaving the pause job claimed
-    [ exit_job, pause_job ].each do |job|
-      assert_job_status(job, :claimed)
-    end
-
     assert process_exists?(@pid)
     terminate_process(@pid)
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -53,6 +53,17 @@ class ActiveSupport::TestCase
     end
   end
 
+  def run(...)
+    # Rails 8.1.dev changed default logging levels
+    if defined?(with_debug_event_reporting)
+      with_debug_event_reporting do
+        super
+      end
+    else
+      super
+    end
+  end
+
   private
     def wait_while_with_timeout(timeout, &block)
       wait_while_with_timeout!(timeout, &block)
diff --git a/test/unit/configuration_test.rb b/test/unit/configuration_test.rb
@@ -26,6 +26,13 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_processes configuration, :dispatcher, 1, batch_size: SolidQueue::Configuration::DISPATCHER_DEFAULTS[:batch_size]
   end
 
+  test "warns if provided configuration file does not exist" do
+    assert_output "[solid_queue] WARNING: Provided configuration file '/path/to/nowhere.yml' does not exist. Falling back to default configuration.\n" do
+      configuration = SolidQueue::Configuration.new(config_file: Pathname.new("/path/to/nowhere.yml"))
+      assert configuration.valid?
+    end
+  end
+
   test "read configuration from default file" do
     configuration = SolidQueue::Configuration.new
     assert 3, configuration.configured_processes.count
@@ -120,16 +127,20 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert error.include?("periodic_invalid_class: Class name doesn't correspond to an existing class")
     assert error.include?("periodic_incorrect_schedule: Schedule is not a supported recurring schedule")
 
-    assert SolidQueue::Configuration.new(recurring_schedule_file: config_file_path(:empty_recurring)).valid?
+    assert_output(/Provided configuration file '[^']+' does not exist\./) do
+      assert SolidQueue::Configuration.new(recurring_schedule_file: config_file_path(:empty_recurring)).valid?
+    end
     assert SolidQueue::Configuration.new(skip_recurring: true).valid?
 
     configuration = SolidQueue::Configuration.new(recurring_schedule_file: config_file_path(:recurring_with_production_only))
     assert configuration.valid?
     assert_processes configuration, :scheduler, 0
 
-    configuration = SolidQueue::Configuration.new(recurring_schedule_file: config_file_path(:recurring_with_empty))
-    assert configuration.valid?
-    assert_processes configuration, :scheduler, 0
+    assert_output(/Provided configuration file '[^']+' does not exist\./) do
+      configuration = SolidQueue::Configuration.new(recurring_schedule_file: config_file_path(:recurring_with_empty))
+      assert configuration.valid?
+      assert_processes configuration, :scheduler, 0
+    end
 
     # No processes
     configuration = SolidQueue::Configuration.new(skip_recurring: true, dispatchers: [], workers: [])
diff --git a/test/unit/dispatcher_test.rb b/test/unit/dispatcher_test.rb
@@ -107,6 +107,8 @@ class DispatcherTest < ActiveSupport::TestCase
 
     assert_equal 0, SolidQueue::ScheduledExecution.count
     assert_equal 3, SolidQueue::ReadyExecution.count
+  ensure
+    dispatcher.stop
   end
 
   test "sleeps `polling_interval` between polls if there are no un-dispatched jobs" do
@@ -117,6 +119,8 @@ class DispatcherTest < ActiveSupport::TestCase
 
     dispatcher.start
     wait_while_with_timeout(1.second) { !SolidQueue::ScheduledExecution.exists? }
+  ensure
+    dispatcher.stop
   end
 
   private
