delayed_job_master 3.0.1 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bde4178a3a916bd11ef509370761d7776d1678001b58640d898e7406083038a5
-  data.tar.gz: 1b96fa607eeefd616fdaf7c8984249417ebbe1034545ed0f3b5188d1f8108a90
+  metadata.gz: c64ac5ffbb010ea728b8ecd5ab347e7ad4971736572a9ef92b19bfe5454c4a89
+  data.tar.gz: 7346a6743488dbe534e2fd7b772510c529350a7e19ec90ad23149898acc138fa
 SHA512:
-  metadata.gz: 4814327c73cad53727c33b0397a27268f2ef82473eecbeadb5ae7c009fe9e6e0fa14ebc7b2e225677b5d94f4c009d82f2bde10fe646fc5432520423b0cd61b0f
-  data.tar.gz: a10fa10a78e642b209969bed0e0ac0098cae344e2a64970ad2e7cecdf4ac743a4c9537457de5d96112afc1b7a77c07bfcc6b9282164968cecfd34dae889820a0
+  metadata.gz: f19876c0847934d89437522d51b8afe4d5925af0bbb1157dbfa2190ccd0ae60ac2bde30d591d296cdbde7d08a55309083e089ce67828bb030ac0baa2f152dd58
+  data.tar.gz: 28ab1a59dee710808ee8b8e4f4bfb18d172f4845a4aff46693fb66b2a69913671844c079d224c63ec49a23ccf0d5464cf97c5045ab6b030546f744261923c1e0

data/.github/workflows/ci.yml

@@ -4,10 +4,10 @@ on: [push, pull_request]
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
-        image: postgres:9.5
+        image: postgres:15
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -24,8 +24,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7, '3.0', 3.1, 3.2]
-        gemfile: ['rails60', 'rails61', 'rails70']
+        ruby: [2.7, '3.0', 3.1, 3.2, 3.3]
+        gemfile: ['rails60', 'rails61', 'rails70', 'rails71']
         database: ['postgresql', 'mysql']
         database_config: ['default', 'multi']
 
@@ -39,7 +39,7 @@ jobs:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/.gitignore

@@ -6,4 +6,5 @@
 /spec/reports/
 /spec/**/log/*.log
 /spec/**/tmp/*
+/tmp/
 /vendor/

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 3.1.1
+
+* Add `frozen_string_literal: true`.
+
+## 3.1.0
+
+* Add timer feature.
+
 ## 3.0.1
 
 * Fix title of forked process.

data/README.md

@@ -48,7 +48,7 @@ working_directory Dir.pwd
 monitor_interval 5
 
 # polling interval for new jobs (in seconds)
-polling_interval 5
+polling_interval 30
 
 # path to pid file
 pid_file "#{Dir.pwd}/tmp/pids/delayed_job_master.pid"

data/gemfiles/rails71.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 7.1.0"
+
+gemspec path: "../"

data/lib/delayed/master/config.rb

@@ -22,7 +22,7 @@ module Delayed
         @log_file = "#{@working_directory}/log/delayed_job_master.log"
         @log_level = :info
         @monitor_interval = 5
-        @polling_interval = 5
+        @polling_interval = 30
         @databases = []
         CALLBACK_CONFIGS.each do |name|
           send("#{name}=", [])

data/lib/delayed/master/job.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Delayed
+  module Master
+    class Job
+      attr_accessor :database, :setting, :id, :run_at
+
+      def initialize(attrs = {})
+        attrs.each do |k, v|
+          send("#{k}=", v)
+        end
+      end
+    end
+  end
+end

data/lib/delayed/master/job_checker.rb

@@ -16,7 +16,9 @@ module Delayed
         @databases = master.databases
         @callbacks = master.callbacks
         @queues = @databases.map { |database| [database, Queue.new] }.to_h
-        @threads = []
+        @threads = SafeArray.new
+        @timer_threads = SafeArray.new
+        @job_finder = JobFinder.new(master)
       end
 
       def start
@@ -53,6 +55,15 @@ module Delayed
         end
       end
 
+      def start_timer_thread(database, run_at)
+        @timer_threads << Thread.new(database, run_at) do |database, run_at|
+          interval = run_at.to_f - Time.zone.now.to_f
+          sleep interval if interval > 0
+          schedule(database)
+          @timer_threads.delete(Thread.current)
+        end
+      end
+
       def stop
         @databases.each do |database|
           queue = @queues[database]
@@ -70,56 +81,60 @@ module Delayed
 
       def wait
         @threads.each(&:join)
+        @timer_threads.each(&:join)
       end
 
       def shutdown
         @threads.each(&:kill)
+        @timer_threads.each(&:kill)
       end
 
       private
 
       def check(database)
-        free_settings = detect_free_settings(database)
-        return if free_settings.blank?
-
         @master.logger.debug { "checking jobs @#{database.spec_name}..." }
-        settings = check_jobs(database, free_settings)
-        if settings.present?
-          @master.logger.info { "found jobs for #{settings.uniq.map(&:worker_info).join(', ')}" }
-          fork_workers(database, settings)
-        end
+        check_jobs(database)
+        check_recent_jobs(database)
       rescue => e
         @master.logger.warn { "#{e.class}: #{e.message}" }
         @master.logger.debug { e.backtrace.join("\n") }
       end
 
-      def detect_free_settings(database)
-        @config.worker_settings.each_with_object([]) do |setting, array|
-          used_count = @master.workers.count { |worker| worker.setting.queues == setting.queues }
-          free_count = setting.max_processes - used_count
-          array << [setting, free_count] if free_count > 0
+      def check_jobs(database)
+        jobs = find_jobs(database)
+        jobs.each do |job|
+          @master.logger.info { "found jobs @#{job.database.spec_name} for #{job.setting.worker_info}" }
+          fork_worker(job.database, job.setting)
         end
       end
 
-      def check_jobs(database, settings)
-        finder = JobFinder.new(database.model)
+      def find_jobs(database)
+        free_settings = count_free_settings
+        free_settings.map do |setting, free_count|
+          @job_finder.ready_jobs(database, setting, free_count)
+        end.flatten
+      end
 
-        settings.each_with_object([]) do |(setting, free_count), array|
-          job_ids = finder.call(setting, free_count)
-          if job_ids.size > 0
-            [free_count, job_ids.size].min.times do
-              array << setting
-            end
-          end
-        end
+      def count_free_settings
+        @config.worker_settings.map do |setting|
+          used_count = @master.workers.count { |worker| worker.setting == setting }
+          free_count = setting.max_processes - used_count
+          [setting, free_count] if free_count > 0
+        end.compact.to_h
+      end
+
+      def fork_worker(database, setting)
+        worker = Worker.new(database: database, setting: setting)
+        Forker.new(@master).call(worker)
+        @master.workers << worker
+        @master.monitoring.schedule(worker)
       end
 
-      def fork_workers(database, settings)
-        settings.each do |setting|
-          worker = Worker.new(database: database, setting: setting)
-          Forker.new(@master).call(worker)
-          @master.workers << worker
-          @master.monitoring.schedule(worker)
+      def check_recent_jobs(database)
+        jobs = @job_finder.recent_jobs(database)
+        jobs.each do |job|
+          @master.logger.info { "set timer to #{job.run_at.iso8601(6)} @#{job.database.spec_name}" }
+          start_timer_thread(job.database, job.run_at)
         end
       end
     end

data/lib/delayed/master/job_finder.rb

@@ -1,31 +1,49 @@
 # frozen_string_literal: true
 
+require_relative 'job'
+
 # JobFinder runs SQL query which is almost same as delayed_job_active_record.
 # See https://github.com/collectiveidea/delayed_job_active_record/blob/master/lib/delayed/backend/active_record.rb
 module Delayed
   module Master
     class JobFinder
-      def initialize(model)
-        @model = model
+      def initialize(master)
+        @config = master.config
       end
 
-      def call(setting, limit)
-        scope(setting).limit(limit).pluck(:id)
+      def ready_jobs(database, setting, limit)
+        ready_scope(database, setting).limit(limit).pluck(:id, :run_at).map do |id, run_at|
+          Job.new(database: database, setting: setting, id: id, run_at: run_at)
+        end
       end
 
-      def count(setting)
-        scope(setting).count
+      def recent_jobs(database)
+        recent_scope(database).order(:run_at).limit(1).pluck(:id, :run_at).map do |id, run_at|
+          Job.new(database: database, id: id, run_at: run_at)
+        end
       end
 
       private
 
-      def scope(setting)
-        @model.ready_to_run(nil, setting.max_run_time || Delayed::Worker::DEFAULT_MAX_RUN_TIME).tap do |jobs|
+      def ready_scope(database, setting)
+        model = database.model
+        model.where("(run_at <= ? AND (locked_at IS NULL OR locked_at < ?)) AND failed_at IS NULL",
+          model.db_time_now,
+          model.db_time_now - (setting.max_run_time || Delayed::Worker::DEFAULT_MAX_RUN_TIME)
+        ).tap do |jobs|
           jobs.where!("priority >= ?", setting.min_priority) if setting.min_priority
           jobs.where!("priority <= ?", setting.max_priority) if setting.max_priority
           jobs.where!(queue: setting.queues) if setting.queues.present?
         end
       end
+
+      def recent_scope(database)
+        model = database.model
+        model.where("run_at > ? AND run_at < ? AND locked_at IS NULL AND failed_at IS NULL",
+          model.db_time_now,
+          model.db_time_now + @config.polling_interval,
+        )
+      end
     end
   end
 end

data/lib/delayed_job_master/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DelayedJobMaster
   class Railtie < Rails::Railtie
     config.after_initialize do

data/lib/delayed_job_master/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DelayedJobMaster
-  VERSION = "3.0.1"
+  VERSION = "3.1.1"
 end

data/lib/delayed_job_master.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support'
 
 require_relative 'delayed_job_master/version'

data/lib/generators/delayed_job_master/config_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 
 module DelayedJobMaster

data/lib/generators/delayed_job_master/templates/config.rb

@@ -5,7 +5,7 @@ working_directory Dir.pwd
 monitor_interval 5
 
 # polling interval for new jobs (in seconds)
-polling_interval 5
+polling_interval 30
 
 # path to pid file
 pid_file "#{Dir.pwd}/tmp/pids/delayed_job_master.pid"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_master
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.1
 platform: ruby
 authors:
 - Yoshikazu Kaneta
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-29 00:00:00.000000000 Z
+date: 2024-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -184,6 +184,7 @@ files:
 - gemfiles/rails60.gemfile
 - gemfiles/rails61.gemfile
 - gemfiles/rails70.gemfile
+- gemfiles/rails71.gemfile
 - lib/delayed/master.rb
 - lib/delayed/master/callbacks.rb
 - lib/delayed/master/command.rb
@@ -192,6 +193,7 @@ files:
 - lib/delayed/master/database.rb
 - lib/delayed/master/file_reopener.rb
 - lib/delayed/master/forker.rb
+- lib/delayed/master/job.rb
 - lib/delayed/master/job_checker.rb
 - lib/delayed/master/job_finder.rb
 - lib/delayed/master/job_listener.rb
@@ -223,7 +225,7 @@ homepage: https://github.com/kanety/delayed_job_master
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -239,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A simple delayed_job master process to control multiple workers
 test_files: []