crono_trigger 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9713612dde3158cacbad3f58c85b0a0935d4e67b687d372c2c5537fcd4407b0c
-  data.tar.gz: b2f053b4fe4f268cccb40c7dddbca0c4c2deeba8b119c656d50548a541a5e812
+  metadata.gz: 734da2ad0480e79b440d8ef73f9b83fb88f13e6f6510513340c62b70c3750c39
+  data.tar.gz: b338b9c86a9fdf01d0ba739fa9f53c9536393cec05d7fe5c8943fe05782ad7b4
 SHA512:
-  metadata.gz: 66a6ff6c554f59ea9448c72d735f872c6ead66da77bbaf7377baadc91c4c233c38ca0ec906dcbb4589678ce676c121fe6e31b6517f836417c1e82d61e67a012f
-  data.tar.gz: 2583529dca847b25bc79c3778c1130e9fd4078ebd8734b8019e04618c341dd1febb0f457a17554a4d41bde0dcd4e3ac9ccdd95fcad90f34b3bfc063ebab76d39
+  metadata.gz: 6e73b97cece87a4b887e4cec1c5cbd153cc9ad51c3de1956c38ef2a5000fa74c0d3e52c07401c0aa033f0921852a2f6be85533aea050d425dc220c591681a210
+  data.tar.gz: dfbec13afaa581a544b50481fa54509ace24de39f8ecb6d99788e508bd680da1e5afd89abeb0cde7be8ad8db3c7c4b56ae67dbdf0bd087775eaeed62b92d8cac

data/lib/crono_trigger/polling_thread.rb

@@ -10,6 +10,7 @@ module CronoTrigger
       end
       @execution_counter = execution_counter
       @quiet = Concurrent::AtomicBoolean.new(false)
+      @worker_count = 1
     end
 
     def run
@@ -58,7 +59,7 @@ module CronoTrigger
       maybe_has_next = true
       while maybe_has_next && !@stop_flag.set?
         records, maybe_has_next = model.connection_pool.with_connection do
-          model.executables_with_lock(limit: CronoTrigger.config.fetch_records || CronoTrigger.config.executor_thread * 3)
+          model.executables_with_lock(limit: CronoTrigger.config.fetch_records || CronoTrigger.config.executor_thread * 3, worker_count: @worker_count)
         end
 
         records.each do |record|
@@ -74,6 +75,11 @@ module CronoTrigger
       end
     end
 
+    def worker_count=(n)
+      raise ArgumentError, "worker_count must be greater than 0" if n <= 0
+      @worker_count = n
+    end
+
     private
 
     def process_record(record)

data/lib/crono_trigger/schedulable.rb

@@ -63,8 +63,11 @@ module CronoTrigger
     end
 
     module ClassMethods
-      def executables_with_lock(limit: CronoTrigger.config.executor_thread * 3)
-        ids = executables(limit: limit).pluck(:id)
+      def executables_with_lock(limit: CronoTrigger.config.executor_thread * 3, worker_count: 1)
+        # Fetch more than `limit` records because other workers might have acquired the lock
+        # and this method might not be able to return enough records for the executor to
+        # make the best use of the CPU.
+        ids = executables(limit: limit * worker_count).pluck(:id)
         maybe_has_next = !ids.empty?
         records = []
         ids.each do |id|
@@ -75,6 +78,8 @@ module CronoTrigger
               records << r
             end
           end
+
+          return [records, maybe_has_next] if records.size == limit
         end
         [records, maybe_has_next]
       end

data/lib/crono_trigger/version.rb

@@ -1,3 +1,3 @@
 module CronoTrigger
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

data/lib/crono_trigger/worker.rb

@@ -7,6 +7,7 @@ module CronoTrigger
     HEARTBEAT_INTERVAL = 60
     SIGNAL_FETCH_INTERVAL = 10
     MONITOR_INTERVAL = 20
+    WORKER_COUNT_UPDATE_INTERVAL = 60
     EXECUTOR_SHUTDOWN_TIMELIMIT = 300
     OTHER_THREAD_SHUTDOWN_TIMELIMIT = 120
     attr_reader :polling_threads
@@ -37,6 +38,7 @@ module CronoTrigger
       @heartbeat_thread = run_heartbeat_thread
       @signal_fetcn_thread = run_signal_fetch_thread
       @monitor_thread = run_monitor_thread
+      @worker_count_updater_thread = run_worker_count_updater_thread
 
       polling_thread_count = CronoTrigger.config.polling_thread || [@model_names.size, Concurrent.processor_count].min
       # Assign local variable for Signal handling
@@ -58,6 +60,7 @@ module CronoTrigger
       @executor.wait_for_termination(EXECUTOR_SHUTDOWN_TIMELIMIT)
       @heartbeat_thread.join(OTHER_THREAD_SHUTDOWN_TIMELIMIT)
       @signal_fetcn_thread.join(OTHER_THREAD_SHUTDOWN_TIMELIMIT)
+      @worker_count_updater_thread.join(OTHER_THREAD_SHUTDOWN_TIMELIMIT)
 
       unregister
     end
@@ -104,6 +107,15 @@ module CronoTrigger
       end
     end
 
+    def run_worker_count_updater_thread
+      update_worker_count
+      Thread.start do
+        until @stop_flag.wait_for_set(WORKER_COUNT_UPDATE_INTERVAL)
+          update_worker_count
+        end
+      end
+    end
+
     def heartbeat
       CronoTrigger::Models::Worker.connection_pool.with_connection do
         begin
@@ -162,7 +174,7 @@ module CronoTrigger
       return unless ActiveSupport::Notifications.notifier.listening?(CronoTrigger::Events::MONITOR)
 
       CronoTrigger::Models::Worker.connection_pool.with_connection do
-        if CronoTrigger.workers.where("polling_model_names = ?", @model_names.to_json).order(:worker_id).limit(1).pluck(:worker_id).first != @crono_trigger_worker_id
+        if workers_processing_same_models.order(:worker_id).limit(1).pluck(:worker_id).first != @crono_trigger_worker_id
           # Return immediately to avoid redundant instruments
           return
         end
@@ -189,5 +201,19 @@ module CronoTrigger
     rescue => ex
       CronoTrigger::GlobalExceptionHandler.handle_global_exception(ex)
     end
+
+    def update_worker_count
+      CronoTrigger::Models::Worker.connection_pool.with_connection do
+        worker_count = workers_processing_same_models.count
+        return if worker_count.zero?
+        @polling_threads.each { |th| th.worker_count = worker_count }
+      end
+    rescue => ex
+      CronoTrigger::GlobalExceptionHandler.handle_global_exception(ex)
+    end
+
+    def workers_processing_same_models
+      CronoTrigger.workers.where("polling_model_names = ?", @model_names.to_json)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crono_trigger
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - joker1007
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chrono