workhorse 1.5.2 → 2.0.0.rc0

data/test/workhorse/worker_test.rb

@@ -1,6 +1,98 @@
 require 'test_helper'
 
 class Workhorse::WorkerTest < WorkhorseTest
+  # Guards the interleaving that deadlocks the worker if #shutdown holds the
+  # mutex while waiting for the poller thread: that thread may be in #perform
+  # waiting for the same mutex, having just committed the lock on a job.
+  def test_shutdown_while_the_poller_posts_a_job
+    job = Workhorse.enqueue BasicJob.new(sleep_time: 0)
+    w = Workhorse::Worker.new(polling_interval: 60, pool_size: 1)
+
+    # As the poller would have, in a transaction that has already committed.
+    job.mark_locked!(w.id)
+
+    at_perform = Concurrent::Event.new
+    posted = Concurrent::Event.new
+
+    w.poller.define_singleton_method(:poll) do
+      next if @posted_once
+
+      @posted_once = true
+      at_perform.set
+      # Give the shutdown below time to get as far as waiting for this thread.
+      Kernel.sleep 0.3
+      worker.perform(job.id)
+      posted.set
+    end
+
+    w.start
+
+    assert at_perform.wait(5), 'poller did not reach the job posting'
+
+    Timeout.timeout(15) do
+      w.shutdown
+    end
+
+    assert posted.wait(5), 'poller thread never returned from #perform'
+
+    job.reload
+
+    assert_equal 'waiting', job.state
+    assert_nil job.locked_at
+    assert_nil job.locked_by
+  end
+
+  # #shutdown promises that running jobs have finished once it returns. Both
+  # TERM and INT are sent by the daemon's stop, so a repeat call has to keep
+  # that promise too rather than returning while the first one is still
+  # waiting for the pool.
+  def test_a_repeated_shutdown_waits_for_the_running_job
+    job = Workhorse.enqueue BasicJob.new(sleep_time: 2)
+    w = Workhorse::Worker.new(polling_interval: 0.2, pool_size: 1)
+    w.start
+
+    with_retries(60, interval: 0.05) { assert_equal 'started', job.reload.state }
+
+    states = Concurrent::Array.new
+    first = Thread.new { w.shutdown }
+    sleep 0.3
+    second = Thread.new do
+      w.shutdown
+      states << job.reload.state
+    end
+
+    Timeout.timeout(15) { second.join }
+
+    assert_equal ['succeeded'], states.to_a,
+                 'a repeated shutdown must not return while a job is still running'
+    assert_equal :shutdown, w.state
+  ensure
+    first&.join
+  end
+
+  def test_shutdown_of_a_worker_that_was_never_started
+    w = Workhorse::Worker.new(polling_interval: 60)
+
+    Timeout.timeout(5) { w.shutdown }
+
+    assert_equal :initialized, w.state
+  end
+
+  # A job that another worker already reset - or that never got locked - must
+  # be left alone rather than reset a second time.
+  def test_a_job_that_is_no_longer_locked_is_not_released
+    job = Workhorse.enqueue BasicJob.new(sleep_time: 0)
+    w = Workhorse::Worker.new(polling_interval: 60, pool_size: 1)
+    w.start
+    w.shutdown
+
+    job.update_columns(state: 'succeeded')
+
+    w.send(:release, job.id)
+
+    assert_equal 'succeeded', job.reload.state
+  end
+
   def test_idle
     with_worker(pool_size: 5, polling_interval: 0.2) do |w|
       assert_equal 5, w.idle

data/workhorse.gemspec

@@ -1,24 +1,25 @@
 # -*- encoding: utf-8 -*-
-# stub: workhorse 1.5.2 ruby lib
+# stub: workhorse 2.0.0.rc0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "workhorse".freeze
-  s.version = "1.5.2".freeze
+  s.version = "2.0.0.rc0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sitrox".freeze]
-  s.date = "2026-08-04"
-  s.files = [".github/workflows/ruby.yml".freeze, ".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, "CHANGELOG.md".freeze, "FAQ.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/rubocop".freeze, "lib/active_job/queue_adapters/workhorse_adapter.rb".freeze, "lib/generators/workhorse/install_generator.rb".freeze, "lib/generators/workhorse/templates/bin/workhorse.rb".freeze, "lib/generators/workhorse/templates/config/initializers/workhorse.rb".freeze, "lib/generators/workhorse/templates/create_table_jobs.rb".freeze, "lib/workhorse.rb".freeze, "lib/workhorse/active_job_extension.rb".freeze, "lib/workhorse/daemon.rb".freeze, "lib/workhorse/daemon/shell_handler.rb".freeze, "lib/workhorse/db_job.rb".freeze, "lib/workhorse/enqueuer.rb".freeze, "lib/workhorse/jobs/cleanup_succeeded_jobs.rb".freeze, "lib/workhorse/jobs/detect_stale_jobs_job.rb".freeze, "lib/workhorse/jobs/run_active_job.rb".freeze, "lib/workhorse/jobs/run_rails_op.rb".freeze, "lib/workhorse/performer.rb".freeze, "lib/workhorse/poller.rb".freeze, "lib/workhorse/pool.rb".freeze, "lib/workhorse/scoped_env.rb".freeze, "lib/workhorse/worker.rb".freeze, "test/active_job/queue_adapters/workhorse_adapter_test.rb".freeze, "test/lib/db_schema.rb".freeze, "test/lib/jobs.rb".freeze, "test/lib/test_helper.rb".freeze, "test/workhorse/daemon_test.rb".freeze, "test/workhorse/db_job_test.rb".freeze, "test/workhorse/enqueuer_test.rb".freeze, "test/workhorse/performer_test.rb".freeze, "test/workhorse/poller_test.rb".freeze, "test/workhorse/pool_test.rb".freeze, "test/workhorse/worker_test.rb".freeze, "test/workhorse/yjit_test.rb".freeze, "workhorse.gemspec".freeze]
+  s.date = "2026-09-29"
+  s.files = [".github/workflows/ruby.yml".freeze, ".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, "CHANGELOG.md".freeze, "FAQ.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/rubocop".freeze, "lib/active_job/queue_adapters/workhorse_adapter.rb".freeze, "lib/generators/workhorse/install_generator.rb".freeze, "lib/generators/workhorse/templates/bin/workhorse.rb".freeze, "lib/generators/workhorse/templates/config/initializers/workhorse.rb".freeze, "lib/generators/workhorse/templates/create_table_jobs.rb".freeze, "lib/generators/workhorse/templates/create_table_workhorse_schedules.rb".freeze, "lib/workhorse.rb".freeze, "lib/workhorse/active_job_extension.rb".freeze, "lib/workhorse/daemon.rb".freeze, "lib/workhorse/daemon/shell_handler.rb".freeze, "lib/workhorse/db_job.rb".freeze, "lib/workhorse/enqueuer.rb".freeze, "lib/workhorse/jobs/cleanup_succeeded_jobs.rb".freeze, "lib/workhorse/jobs/detect_late_schedules_job.rb".freeze, "lib/workhorse/jobs/detect_stale_jobs_job.rb".freeze, "lib/workhorse/jobs/run_active_job.rb".freeze, "lib/workhorse/jobs/run_rails_op.rb".freeze, "lib/workhorse/notifiers/base.rb".freeze, "lib/workhorse/notifiers/file_system.rb".freeze, "lib/workhorse/notifiers/none.rb".freeze, "lib/workhorse/notifiers/redis.rb".freeze, "lib/workhorse/performer.rb".freeze, "lib/workhorse/poller.rb".freeze, "lib/workhorse/pool.rb".freeze, "lib/workhorse/schedule.rb".freeze, "lib/workhorse/schedules.rb".freeze, "lib/workhorse/scoped_env.rb".freeze, "lib/workhorse/worker.rb".freeze, "test/active_job/queue_adapters/workhorse_adapter_test.rb".freeze, "test/lib/db_schema.rb".freeze, "test/lib/jobs.rb".freeze, "test/lib/test_helper.rb".freeze, "test/workhorse/daemon_test.rb".freeze, "test/workhorse/db_job_test.rb".freeze, "test/workhorse/enqueuer_test.rb".freeze, "test/workhorse/notifier_test.rb".freeze, "test/workhorse/performer_test.rb".freeze, "test/workhorse/poller_test.rb".freeze, "test/workhorse/pool_test.rb".freeze, "test/workhorse/schedule_test.rb".freeze, "test/workhorse/worker_test.rb".freeze, "test/workhorse/yjit_test.rb".freeze, "workhorse.gemspec".freeze]
   s.homepage = "https://github.com/sitrox/workhorse".freeze
   s.licenses = ["MIT".freeze]
   s.rubygems_version = "3.5.18".freeze
   s.summary = "Multi-threaded job backend with database queuing for ruby.".freeze
-  s.test_files = ["test/active_job/queue_adapters/workhorse_adapter_test.rb".freeze, "test/lib/db_schema.rb".freeze, "test/lib/jobs.rb".freeze, "test/lib/test_helper.rb".freeze, "test/workhorse/daemon_test.rb".freeze, "test/workhorse/db_job_test.rb".freeze, "test/workhorse/enqueuer_test.rb".freeze, "test/workhorse/performer_test.rb".freeze, "test/workhorse/poller_test.rb".freeze, "test/workhorse/pool_test.rb".freeze, "test/workhorse/worker_test.rb".freeze, "test/workhorse/yjit_test.rb".freeze]
+  s.test_files = ["test/active_job/queue_adapters/workhorse_adapter_test.rb".freeze, "test/lib/db_schema.rb".freeze, "test/lib/jobs.rb".freeze, "test/lib/test_helper.rb".freeze, "test/workhorse/daemon_test.rb".freeze, "test/workhorse/db_job_test.rb".freeze, "test/workhorse/enqueuer_test.rb".freeze, "test/workhorse/notifier_test.rb".freeze, "test/workhorse/performer_test.rb".freeze, "test/workhorse/poller_test.rb".freeze, "test/workhorse/pool_test.rb".freeze, "test/workhorse/schedule_test.rb".freeze, "test/workhorse/worker_test.rb".freeze, "test/workhorse/yjit_test.rb".freeze]
 
   s.specification_version = 4
 
   s.add_runtime_dependency(%q<activesupport>.freeze, [">= 7.0.0".freeze])
   s.add_runtime_dependency(%q<activerecord>.freeze, [">= 7.0.0".freeze])
   s.add_runtime_dependency(%q<concurrent-ruby>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<fugit>.freeze, [">= 0".freeze])
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: workhorse
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 2.0.0.rc0
 platform: ruby
 authors:
 - Sitrox
 bindir: bin
 cert_chain: []
-date: 2026-08-04 00:00:00.000000000 Z
+date: 2026-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -51,6 +51,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fugit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -73,6 +87,7 @@ files:
 - lib/generators/workhorse/templates/bin/workhorse.rb
 - lib/generators/workhorse/templates/config/initializers/workhorse.rb
 - lib/generators/workhorse/templates/create_table_jobs.rb
+- lib/generators/workhorse/templates/create_table_workhorse_schedules.rb
 - lib/workhorse.rb
 - lib/workhorse/active_job_extension.rb
 - lib/workhorse/daemon.rb
@@ -80,12 +95,19 @@ files:
 - lib/workhorse/db_job.rb
 - lib/workhorse/enqueuer.rb
 - lib/workhorse/jobs/cleanup_succeeded_jobs.rb
+- lib/workhorse/jobs/detect_late_schedules_job.rb
 - lib/workhorse/jobs/detect_stale_jobs_job.rb
 - lib/workhorse/jobs/run_active_job.rb
 - lib/workhorse/jobs/run_rails_op.rb
+- lib/workhorse/notifiers/base.rb
+- lib/workhorse/notifiers/file_system.rb
+- lib/workhorse/notifiers/none.rb
+- lib/workhorse/notifiers/redis.rb
 - lib/workhorse/performer.rb
 - lib/workhorse/poller.rb
 - lib/workhorse/pool.rb
+- lib/workhorse/schedule.rb
+- lib/workhorse/schedules.rb
 - lib/workhorse/scoped_env.rb
 - lib/workhorse/worker.rb
 - test/active_job/queue_adapters/workhorse_adapter_test.rb
@@ -95,9 +117,11 @@ files:
 - test/workhorse/daemon_test.rb
 - test/workhorse/db_job_test.rb
 - test/workhorse/enqueuer_test.rb
+- test/workhorse/notifier_test.rb
 - test/workhorse/performer_test.rb
 - test/workhorse/poller_test.rb
 - test/workhorse/pool_test.rb
+- test/workhorse/schedule_test.rb
 - test/workhorse/worker_test.rb
 - test/workhorse/yjit_test.rb
 - workhorse.gemspec
@@ -119,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.11
+rubygems_version: 4.0.15
 specification_version: 4
 summary: Multi-threaded job backend with database queuing for ruby.
 test_files:
@@ -130,8 +154,10 @@ test_files:
 - test/workhorse/daemon_test.rb
 - test/workhorse/db_job_test.rb
 - test/workhorse/enqueuer_test.rb
+- test/workhorse/notifier_test.rb
 - test/workhorse/performer_test.rb
 - test/workhorse/poller_test.rb
 - test/workhorse/pool_test.rb
+- test/workhorse/schedule_test.rb
 - test/workhorse/worker_test.rb
 - test/workhorse/yjit_test.rb