Merge branch 'main' into feature/clear-ar-connections-flag

Author: rafael-pissardo

.github/workflows/main.yml

@@ -41,7 +41,7 @@ jobs:
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
         ports:
-          - 33060:3306
+          - 33066:3306
         options: --health-cmd "mysql -h localhost -e \"select now()\"" --health-interval 1s --health-timeout 5s --health-retries 30
       postgres:
         image: postgres:15.1

Gemfile.lock

@@ -109,7 +109,7 @@ GEM
     psych (5.2.2)
       date
       stringio
-    puma (6.4.3)
+    puma (7.0.2)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.1)
@@ -203,7 +203,7 @@ DEPENDENCIES
   mocha
   mysql2
   pg
-  puma
+  puma (~> 7.0)
   rdoc
   rubocop-rails-omakase
   solid_queue!

app/models/solid_queue/job.rb

@@ -10,6 +10,7 @@ class EnqueueError < StandardError; end
 
     class << self
       def enqueue_all(active_jobs)
+        active_jobs.each { |job| job.scheduled_at ||= Time.current }
         active_jobs_by_job_id = active_jobs.index_by(&:job_id)
 
         transaction do

app/models/solid_queue/recurring_task.rb

@@ -48,7 +48,7 @@ def create_or_update_all(tasks)
     end
 
     def delay_from_now
-      [ (next_time - Time.current).to_f, 0 ].max
+      [ (next_time - Time.current).to_f, 0.1 ].max
     end
 
     def next_time

docker-compose.yml

@@ -8,7 +8,7 @@ services:
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     volumes:
       - db:/var/lib/mysql
-    ports: [ "127.0.0.1:33060:3306" ]
+    ports: [ "127.0.0.1:33066:3306" ]
   postgres:
     image: postgres:15.1
     environment:

lib/puma/plugin/solid_queue.rb

@@ -11,15 +11,27 @@ def start(launcher)
       monitor_solid_queue
     end
 
-    launcher.events.on_booted do
-      @solid_queue_pid = fork do
-        Thread.new { monitor_puma }
-        SolidQueue::Supervisor.start
+    if Gem::Version.new(Puma::Const::VERSION) < Gem::Version.new("7")
+      launcher.events.on_booted do
+        @solid_queue_pid = fork do
+          Thread.new { monitor_puma }
+          SolidQueue::Supervisor.start
+        end
+      end
+
+      launcher.events.on_stopped { stop_solid_queue }
+      launcher.events.on_restart { stop_solid_queue }
+    else
+      launcher.events.after_booted do
+        @solid_queue_pid = fork do
+          Thread.new { monitor_puma }
+          SolidQueue::Supervisor.start
+        end
       end
-    end
 
-    launcher.events.on_stopped { stop_solid_queue }
-    launcher.events.on_restart { stop_solid_queue }
+      launcher.events.after_stopped { stop_solid_queue }
+      launcher.events.before_restart { stop_solid_queue }
+    end
   end
 
   private

solid_queue.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "debug", "~> 1.9"
   spec.add_development_dependency "mocha"
-  spec.add_development_dependency "puma"
+  spec.add_development_dependency "puma", "~> 7.0"
   spec.add_development_dependency "mysql2"
   spec.add_development_dependency "pg"
   spec.add_development_dependency "sqlite3"

test/dummy/config/database.yml

@@ -33,7 +33,7 @@ default: &default
   username: root
   pool: 20
   host: "127.0.0.1"
-  port: 33060
+  port: 33066
 <% end %>
 
 development:

test/integration/instrumentation_test.rb

@@ -327,7 +327,7 @@ class InstrumentationTest < ActiveSupport::TestCase
 
     events = subscribed("enqueue_recurring_task.solid_queue") do
       schedulers.each(&:start)
-      sleep 1.01
+      wait_while_with_timeout(1.1.second) { SolidQueue::RecurringExecution.count < 2 }
       schedulers.each(&:stop)
     end
 

test/models/solid_queue/job_test.rb

@@ -356,6 +356,22 @@ class DiscardableNonOverlappingGroupedJob2 < NonOverlappingJob
     assert_equal "enqueued inside a rolled back transaction", job.arguments.dig("arguments", 0)
   end
 
+  test "enqueue_all assigns scheduled_at if missing" do
+    freeze_time do
+      active_jobs = [
+        AddToBufferJob.new(1),
+        AddToBufferJob.new(2).set(wait: 5.minutes)
+      ]
+
+      ActiveJob.perform_all_later(active_jobs)
+
+      jobs = SolidQueue::Job.where(active_job_id: active_jobs.map(&:job_id)).order(:id)
+
+      assert_equal Time.current, jobs[0].scheduled_at
+      assert_equal 5.minutes.from_now, jobs[1].scheduled_at
+    end
+  end
+
   private
     def assert_ready(&block)
       assert_job_counts(ready: 1, &block)