resque-multi-job-forks 0.5.1 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd2a600dbcd1f57dcee123b6cb34f055f170bf9ef8eb1a114ded55841bd99149
-  data.tar.gz: 80a3ffe7e7f626fb77e11487b51faa129a13a60382944d3c5c15e8c60b942c9e
+  metadata.gz: 73e29f0c8722121adb19f9f3dc3a98d06ac059c24f8944c191af09d8e1379d2d
+  data.tar.gz: 6b9589d77c89be94000575d839db7aa6b9363775e6512c5be5fcc23945c1a974
 SHA512:
-  metadata.gz: 1184ff5df61cebf795557a9e93b43be059a6bf1671ab7362a89400dcb2b7d97658e9f06735adf0d7c3a3f9cab57addc755232904ec0dff251106e71e116ffc5c
-  data.tar.gz: e6e76c24c2c2d591cc6c944ab3e8a9ef57ab67510ef1454b78a7e4704c9876fd78e1c44ebf52f47a0404254796728730757b1e5f89ce7e7cdd0c0a06bd93416b
+  metadata.gz: c10f5f45ec3017765431a20d20128ac0ae423ad1ecbc25cd57a51e6e92601fb816bfcd3e5c8c0baa7c4a710308fdc78c3891afe5882aa776759a32986f56a45c
+  data.tar.gz: f39b880a4ead9246a9d88d7961ee91f6a3db3ed5930505feb60c615bd4c1fd21f4b2d35e3033e2dc952188c88dfa55c93f69b41a7e88fb451993d77693a851e3

data/lib/resque-multi-job-forks.rb

@@ -10,6 +10,8 @@ module Resque
     attr_accessor :memory_threshold
     attr_reader   :jobs_processed
 
+    WorkerTerminated = Class.new(StandardError)
+
     def self.multi_jobs_per_fork?
       ENV["DISABLE_MULTI_JOBS_PER_FORK"].nil?
     end
@@ -22,6 +24,20 @@ module Resque
         else
           if term_child
             unregister_signal_handlers
+            trap('TERM') do
+              trap('TERM') do
+                # Ignore subsequent term signals
+              end
+
+              if @performing_job
+                # If a job is in progress, stop it immediately.
+                raise TermException.new("SIGTERM")
+              else
+                # If we're not currently running a job, shut down cleanly.
+                # This allows us to push unworked jobs back on the queue.
+                shutdown
+              end
+            end
             trap('QUIT') { shutdown }
           end
           raise NotImplementedError, "Pretending to not have forked"
@@ -39,9 +55,20 @@ module Resque
 
       def perform_with_multi_job_forks(job = nil)
         @fork_per_job = true unless fork_hijacked? # reconnect and after_fork
+        if shutdown?
+          # We got a request to shut down _after_ grabbing a job but _before_ starting work
+          # on it. Immediately report the job as failed and return.
+          if job
+            report_failed_job(job, WorkerTerminated.new("shutdown before job start"))
+          end
+          return
+        end
+        @performing_job = true
         perform_without_multi_job_forks(job)
         hijack_fork unless fork_hijacked?
         @jobs_processed += 1
+      ensure
+        @performing_job = false
       end
       alias_method :perform_without_multi_job_forks, :perform
       alias_method :perform, :perform_with_multi_job_forks
@@ -91,7 +118,7 @@ module Resque
     def shutdown_child
       return unless @child
       begin
-        log! "multi_jobs_per_fork: Sending QUIT signal to #{@child}"
+        log_with_severity :debug, "multi_jobs_per_fork: Sending QUIT signal to #{@child}"
         Process.kill('QUIT', @child)
       rescue Errno::ESRCH
         nil
@@ -112,7 +139,7 @@ module Resque
     end
 
     def hijack_fork
-      log 'hijack fork.'
+      log_with_severity :debug, 'hijack fork.'
       @suppressed_fork_hooks = [Resque.after_fork, Resque.before_fork]
       Resque.after_fork = Resque.before_fork = nil
       @release_fork_limit = fork_job_limit
@@ -121,11 +148,11 @@ module Resque
     end
 
     def release_fork
-      log "jobs processed by child: #{jobs_processed}; rss: #{rss}"
+      log_with_severity :info, "jobs processed by child: #{jobs_processed}; rss: #{rss}"
       run_hook :before_child_exit, self
       Resque.after_fork, Resque.before_fork = *@suppressed_fork_hooks
       @release_fork_limit = @jobs_processed = nil
-      log 'hijack over, counter terrorists win.'
+      log_with_severity :debug, 'hijack over, counter terrorists win.'
       @shutdown = true
     end
 

data/test/helper.rb

@@ -19,6 +19,7 @@ Resque.redis = $redis
 # set `VERBOSE=true` when running the tests to view resques log output.
 module Resque
   class Worker
+    attr_accessor :start_lag
 
     def log_with_severity(severity, msg)
       if ENV['VERBOSE']
@@ -27,14 +28,18 @@ module Resque
       end
     end
 
-    def log(message)
-      log_with_severity :info, message
+    def report_failed_job(job, exception)
+      $SEQ_WRITER.print "failed_job_#{exception.class.name.downcase.gsub('::', '_')}\n"
     end
 
-    def log!(message)
-      log_with_severity :debug, message
+    def fork_hijacked?
+      if @release_fork_limit
+        if start_lag
+          sleep start_lag
+        end
+      end
+      @release_fork_limit
     end
-
   end
 end
 

data/test/test_resque-multi-job-forks.rb

@@ -8,7 +8,7 @@ class TestResqueMultiJobForks < Test::Unit::TestCase
   end
 
   def test_timeout_limit_sequence_of_events
-    @worker.log! "in test_timeout_limit_sequence_of_events"
+    @worker.log_with_severity :debug, "in test_timeout_limit_sequence_of_events"
     # only allow enough time for 3 jobs to process.
     @worker.seconds_per_fork = 3
 
@@ -29,7 +29,7 @@ class TestResqueMultiJobForks < Test::Unit::TestCase
   end
 
   def test_graceful_shutdown_during_first_job
-    @worker.log! "in test_graceful_shutdown_during_first_job"
+    @worker.log_with_severity :debug, "in test_graceful_shutdown_during_first_job"
     # enough time for all jobs to process.
     @worker.seconds_per_fork = 60
 
@@ -51,7 +51,7 @@ class TestResqueMultiJobForks < Test::Unit::TestCase
   end
 
   def test_immediate_shutdown_during_first_job
-    @worker.log! "in test_immediate_shutdown_during_first_job"
+    @worker.log_with_severity :debug, "in test_immediate_shutdown_during_first_job"
     # enough time for all jobs to process.
     @worker.seconds_per_fork = 60
     @worker.term_child = false
@@ -73,7 +73,7 @@ class TestResqueMultiJobForks < Test::Unit::TestCase
   end
 
   def test_sigterm_shutdown_during_first_job
-    @worker.log! "in test_sigterm_shutdown_during_first_job"
+    @worker.log_with_severity :debug, "in test_sigterm_shutdown_during_first_job"
     # enough time for all jobs to process.
     @worker.seconds_per_fork = 60
     @worker.term_child = true
@@ -91,14 +91,38 @@ class TestResqueMultiJobForks < Test::Unit::TestCase
     sequence = $SEQ_READER.each_line.map {|l| l.strip.to_sym }
 
     # test the sequence is correct.
-    assert_equal([:before_fork, :after_fork,
+    assert_equal([:before_fork, :after_fork, :failed_job_resque_termexception,
                   :before_child_exit_1], sequence, 'correct sequence')
     t.join
   end
 
+  def test_shutdown_between_jobs
+    @worker.log_with_severity :debug, "in test_sigterm_shutdown_during_first_job"
+    # enough time for all jobs to process.
+    @worker.seconds_per_fork = 60
+    @worker.term_child = true
+    @worker.graceful_term = true
+    @worker.term_timeout = 0.5
+    @worker.start_lag = 1
+
+    Resque.enqueue(QuickSequenceJob, 1)
+    Resque.enqueue(SequenceJob, 2)
+    t = Thread.new do
+      sleep 2
+      Process.kill("TERM", @worker.pid)
+    end
+    @worker.work(0)
+    $SEQ_WRITER.close
+
+    sequence = $SEQ_READER.each_line.map {|l| l.strip.to_sym }
+    assert_equal([:before_fork, :after_fork, :work_1, :before_child_exit_1, :failed_job_resque_worker_workerterminated], sequence, 'correct sequence')
+
+    t.join
+  end
+
   # test we can also limit fork job process by a job limit.
   def test_job_limit_sequence_of_events
-    @worker.log! "in test_job_limit_sequence_of_events"
+    @worker.log_with_severity :debug, "in test_job_limit_sequence_of_events"
     # only allow 20 jobs per fork
     ENV['JOBS_PER_FORK'] = '20'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-multi-job-forks
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.5
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -21,7 +21,7 @@ dependencies:
         version: 1.27.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: 1.27.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Have your resque workers process more that one job