good_job 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba54d04d3afa9fea7af913fb6e04f3bdbc104f47a57b629001071da7fcd4ed55
-  data.tar.gz: 2bd4dd5be31a15c43d58f0ab7cd33830834e1e2bcd0506445258aa75d4cc98e5
+  metadata.gz: 86268c6767ba44783707ed768fe726b7a53592e46468ed49bd38d427ff4919af
+  data.tar.gz: 5fa72a4aaec59a31ba437eac31f9a6785cdb548c6694bea332434baf58aaad98
 SHA512:
-  metadata.gz: 8ade9720ef3918e10d129e886411b819e8fd96614a299552d68287ed43fcab2997057b8c63ee26b35ac321cf7d58a055c7cf5b14f74f3c887b14f59934537be8
-  data.tar.gz: 9f81f5e7faacbe1b6a4999fa82afa6eb03675472c0237616f6f570c235f72c8c925fbea0ff526726bb6542c795ef47feaa61b5e9dd00520d6a38fbfa4b7463a5
+  metadata.gz: c63baa745a861101b1a65c7a2dd7f4ec603a50714d5952a7ad942f30b41543643e6b7e1f19b1373f280668f212c6e173c4aa90d7d3a0770a92c1e159ae30215b
+  data.tar.gz: 7bf564c4cfc0804f1a32995214195736e9cbd8d8f7a5b45d3ffe7efecf3d43126d412594855d50c9637c646e82838112a4869a4732fa0fe5ba1542b558facd0f

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [v1.7.1](https://github.com/bensheldon/good_job/tree/v1.7.1) (2021-01-27)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v1.7.0...v1.7.1)
+
+**Closed issues:**
+
+- Unexpected behavior with max\_threads = 1 [\#208](https://github.com/bensheldon/good_job/issues/208)
+
+**Merged pull requests:**
+
+- Scheduler should always push a new task on completion of previous task, regardless of available thread calculation [\#209](https://github.com/bensheldon/good_job/pull/209) ([bensheldon](https://github.com/bensheldon))
+- Fix equality typo in development.rb of test\_app [\#207](https://github.com/bensheldon/good_job/pull/207) ([reczy](https://github.com/reczy))
+
 ## [v1.7.0](https://github.com/bensheldon/good_job/tree/v1.7.0) (2021-01-25)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v1.6.0...v1.7.0)
@@ -101,6 +114,7 @@
 
 -  Ensure advisory lock CTE is MATERIALIZED on Postgres v12+ [\#179](https://github.com/bensheldon/good_job/pull/179) ([bensheldon](https://github.com/bensheldon))
 - Ensure that deleted jobs are unlocked [\#178](https://github.com/bensheldon/good_job/pull/178) ([bensheldon](https://github.com/bensheldon))
+- Fix job ordering for Rails 6.1 [\#174](https://github.com/bensheldon/good_job/pull/174) ([morgoth](https://github.com/morgoth))
 
 **Closed issues:**
 
@@ -115,10 +129,6 @@
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v1.3.3...v1.3.4)
 
-**Fixed bugs:**
-
-- Fix job ordering for Rails 6.1 [\#174](https://github.com/bensheldon/good_job/pull/174) ([morgoth](https://github.com/morgoth))
-
 ## [v1.3.3](https://github.com/bensheldon/good_job/tree/v1.3.3) (2020-12-01)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v1.3.2...v1.3.3)

data/lib/good_job/scheduler.rb

@@ -23,7 +23,7 @@ module GoodJob # :nodoc:
       max_threads: Configuration::DEFAULT_MAX_THREADS,
       auto_terminate: true,
       idletime: 60,
-      max_queue: 1, # ideally zero, but 0 == infinite
+      max_queue: Configuration::DEFAULT_MAX_THREADS,
       fallback_policy: :discard,
     }.freeze
 
@@ -71,7 +71,10 @@ module GoodJob # :nodoc:
 
       @max_cache = max_cache || 0
       @pool_options = DEFAULT_POOL_OPTIONS.dup
-      @pool_options[:max_threads] = max_threads if max_threads.present?
+      if max_threads.present?
+        @pool_options[:max_threads] = max_threads
+        @pool_options[:max_queue] = max_threads
+      end
       @pool_options[:name] = "GoodJob::Scheduler(queues=#{@performer.name} max_threads=#{@pool_options[:max_threads]})"
 
       create_pool
@@ -163,7 +166,7 @@ module GoodJob # :nodoc:
     def task_observer(time, output, thread_error)
       GoodJob.on_thread_error.call(thread_error) if thread_error && GoodJob.on_thread_error.respond_to?(:call)
       instrument("finished_job_task", { result: output, error: thread_error, time: time })
-      create_thread if output
+      create_task if output
     end
 
     def warm_cache
@@ -181,11 +184,11 @@ module GoodJob # :nodoc:
       {
         name: @performer.name,
         max_threads: @pool_options[:max_threads],
-        active_threads: @pool.ready_worker_count - @pool_options[:max_threads],
-        inactive_threads: @pool.ready_worker_count,
+        active_threads: @pool_options[:max_threads] - @pool.ready_worker_count,
+        available_threads: @pool.ready_worker_count,
         max_cache: @max_cache,
-        cache_count: cache_count,
-        cache_remaining: remaining_cache_count,
+        active_cache: cache_count,
+        available_cache: remaining_cache_count,
       }
     end
 
@@ -200,6 +203,16 @@ module GoodJob # :nodoc:
       end
     end
 
+    def create_task(delay = 0)
+      future = Concurrent::ScheduledTask.new(delay, args: [@performer], executor: @pool, timer_set: timer_set) do |performer|
+        output = nil
+        Rails.application.executor.wrap { output = performer.next }
+        output
+      end
+      future.add_observer(self, :task_observer)
+      future.execute
+    end
+
     def instrument(name, payload = {}, &block)
       payload = payload.reverse_merge({
                                         scheduler: self,

data/lib/good_job/version.rb

@@ -1,4 +1,4 @@
 module GoodJob
   # GoodJob gem version.
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.7.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob