workhorse 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42369906b8cebe1da36b01035d7a28e9a10af2b39186045d89866eafa9a9e1f8
-  data.tar.gz: aa3f269bc9ec2b4b8e87403466ccf528cc5f2cc5fc60155c2e772e5fa562231e
+  metadata.gz: 3e0ec8f7b72f3bdfbe540ba647baf9ed2c746119e6592be2b95e8e3e1397e53c
+  data.tar.gz: 542e7ca25aca517b4539162cde18c211165b29ba8653b62653d6e0b6ecd1a715
 SHA512:
-  metadata.gz: 790a0ee9aee36fa6b636e8bb9b252428b6d236ed6e45df3e3a3119de5cf25a40027fffe5e92f2968999311a9e14fafa35bc2e7c155df67faa54a334204af8a47
-  data.tar.gz: 6642ffd446bb0666af1cbb96730ac8b13c276d1d9f0bf9db35ca3f0f8f86f3df868ab05cc6aefbe754e18f4f6b909e44b0dfee4d77e994c0f29f2b7ee2d2d08a
+  metadata.gz: c13715991ee9eb3195afd4cef7fc3c7789025bf445bb56750f90f3c2f885401ee40efd7125335e836453dcda63cb46a4a8c5488f6b24f96e3b5e57856b3f6071
+  data.tar.gz: 2d3f9d52eac7f1bbc9fd98ae2ba3ca57c8088b00ee5a0abe8865aeb2522dff0184f03360c9a17f375fee39a8d620d6ea2c95c861af35d686044a1f8e25dff01a

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Workhorse Changelog
 
+## 0.6.4 - 2019-10-12
+
+* Fix #22 where an exception with message `No live threads left. Deadlock?`
+  could be thrown in the worker processes.
+
 ## 0.6.3 - 2019-09-02
 
 * Fix examples in changelog, readme and generator for starting workers. Some of

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/lib/workhorse/pool.rb

@@ -48,8 +48,17 @@ module Workhorse
       @size - @active_threads.value
     end
 
+    # Waits until the pool is shut down. This will wait forever unless you
+    # eventually call shutdown (either before calling `wait` or after it in
+    # another thread).
     def wait
-      @executor.wait_for_termination
+      # Here we use a loop-sleep combination instead of using
+      # ThreadPoolExecutor's `wait_for_termination`. See issue #21 for more
+      # information.
+      loop do
+        break if @executor.shutdown?
+        sleep 0.1
+      end
     end
 
     # Shuts down the pool and waits for termination.

data/test/workhorse/pool_test.rb

@@ -19,6 +19,40 @@ class Workhorse::PoolTest < WorkhorseTest
     end
   end
 
+  # This tries to reproduce issue #21 where the exception "No live threads left.
+  # Deadlock?" was raised when trying to call `wait` on a pool on which
+  # `shutdown` has not been called yet.
+  def test_issue_22
+    # ---------------------------------------------------------------
+    # Here we forcefully disconnect AR and force all other threads
+    # beside the current to exit, as issue #22 cannot be reproduced
+    # when there are other threads besides the current one around.
+    # ---------------------------------------------------------------
+    ActiveRecord::Base.connection_pool.disconnect
+
+    Thread.list.each do |thread|
+      thread.exit unless thread == Thread.current
+    end
+
+    # ---------------------------------------------------------------
+    # The following resulted in an exception and should now work
+    # without any exception.
+    # ---------------------------------------------------------------
+    assert_nothing_raised do
+      p = Workhorse::Pool.new(1)
+      p.post do
+        sleep 1
+      end
+
+      Thread.new do
+        sleep 2
+        p.shutdown
+      end
+
+      p.wait
+    end
+  end
+
   def test_on_idle
     on_idle_calls = Concurrent::AtomicFixnum.new
 

data/workhorse.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: workhorse 0.6.3 ruby lib
+# stub: workhorse 0.6.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "workhorse".freeze
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   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 = "2019-09-02"
+  s.date = "2019-09-12"
   s.files = [".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, ".travis.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/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/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/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, "workhorse.gemspec".freeze]
   s.rubygems_version = "3.0.3".freeze
   s.summary = "Multi-threaded job backend with database queuing for ruby.".freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workhorse
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Sitrox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-02 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler