crono_trigger 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d0ca54718a635b6c32268bcb6ed480683d038923eb5f62cda38e91e3d43356a
-  data.tar.gz: aa5d62ef5ecf4003391485e7392bc6493035a50ce73ca852fc4fa26619b17b2d
+  metadata.gz: 734da2ad0480e79b440d8ef73f9b83fb88f13e6f6510513340c62b70c3750c39
+  data.tar.gz: b338b9c86a9fdf01d0ba739fa9f53c9536393cec05d7fe5c8943fe05782ad7b4
 SHA512:
-  metadata.gz: 54ed50aac9d11ae950e1cad9651a8a4c27a5a07f169eb2c92c8f2c761420f9e6ed2a5b83965df91e7e14e67128ee6a0698f5a6a9d5d6566946b8544f8795dcb0
-  data.tar.gz: 10422746cbf88079591790766fd4e58f9152787e7a9ead6a0f94dbbd286cfc4caab8f69c6547716143db6584c7d6ab5e571435013d17f2ed1e833f77502d745d
+  metadata.gz: 6e73b97cece87a4b887e4cec1c5cbd153cc9ad51c3de1956c38ef2a5000fa74c0d3e52c07401c0aa033f0921852a2f6be85533aea050d425dc220c591681a210
+  data.tar.gz: dfbec13afaa581a544b50481fa54509ace24de39f8ecb6d99788e508bd680da1e5afd89abeb0cde7be8ad8db3c7c4b56ae67dbdf0bd087775eaeed62b92d8cac

data/.github/workflows/rspec.yml

@@ -12,6 +12,9 @@ jobs:
     strategy:
       matrix:
         ruby-version: ['2.7', '3.0', '3.1']
+        gemfile: ["Gemfile", "gemfiles/activerecord-61.gemfile", "gemfiles/activerecord-70.gemfile", "gemfiles/activerecord-71.gemfile"]
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
 
     steps:
     - uses: actions/checkout@v2

data/.gitignore

@@ -18,3 +18,6 @@ spec/dummy/db/*.sqlite3
 spec/dummy/db/*.sqlite3-journal
 spec/dummy/log/*.log
 spec/dummy/tmp/
+spec/testdb.sqlite3*
+
+.gem_rbs_collection

data/gemfiles/{activerecord-50.gemfile → activerecord-61.gemfile}

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.0"
+gem "activerecord", "~> 6.1.0"
 
 gemspec :path => "../"

data/gemfiles/{activerecord-51.gemfile → activerecord-70.gemfile}

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.1.0"
+gem "activerecord", "~> 7.0.0"
 
 gemspec :path => "../"

data/gemfiles/{activerecord-52.gemfile → activerecord-71.gemfile}

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.2.0"
+gem "activerecord", "~> 7.1.0"
 
 gemspec :path => "../"

data/lib/crono_trigger/models/worker.rb

@@ -8,7 +8,12 @@ module CronoTrigger
       ALIVE_THRESHOLD = CronoTrigger::Worker::HEARTBEAT_INTERVAL * 5
 
       enum executor_status: {running: "running", quiet: "quiet", shuttingdown: "shuttingdown", shutdown: "shutdown"}
-      serialize :polling_model_names, JSON
+
+      if ActiveRecord.version >= Gem::Version.new("7.1.0")
+        serialize :polling_model_names, coder: JSON
+      else
+        serialize :polling_model_names, JSON
+      end
 
       scope :alive_workers, proc { where(arel_table[:last_heartbeated_at].gteq(Time.current - ALIVE_THRESHOLD)) }
     end

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.0"
+  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.0
+  version: 0.8.0
 platform: ruby
 authors:
 - joker1007
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-07 00:00:00.000000000 Z
+date: 2024-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chrono
@@ -247,7 +247,6 @@ files:
 - ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -257,9 +256,9 @@ files:
 - crono_trigger.gemspec
 - exe/crono_trigger
 - exe/crono_trigger-web
-- gemfiles/activerecord-50.gemfile
-- gemfiles/activerecord-51.gemfile
-- gemfiles/activerecord-52.gemfile
+- gemfiles/activerecord-61.gemfile
+- gemfiles/activerecord-70.gemfile
+- gemfiles/activerecord-71.gemfile
 - lib/crono_trigger.rb
 - lib/crono_trigger/cli.rb
 - lib/crono_trigger/events.rb
@@ -341,7 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: In Service Asynchronous Job Scheduler for Rails

data/.travis.yml

@@ -1,18 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.0
-  - 2.6.3
-gemfile:
-  - gemfiles/activerecord-52.gemfile
-before_install:
-  - gem i bundler
-  - mysql -e 'CREATE DATABASE IF NOT EXISTS test;'
-services:
-  - mysql
-env:
-  - DB=sqlite
-  - DB=mysql MYSQL_RESTART_COMMAND="sudo service mysql restart"
-  - NO_TIMESTAMP=false
-  - NO_TIMESTAMP=true