resque-multi-job-forks 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cb28f2bcae133394c2e1a4e2cd71c256030fdefcb86dfb9c3300913056a9324
-  data.tar.gz: a2a002cc266e7c42ac9e92388ea2837392e697b3a27aa4d033577223f3900596
+  metadata.gz: 142ac780146f82b8ab449daa58bfcb1319f113207045b9c94d6d81595e9dd399
+  data.tar.gz: fcaf1e33dc1aefae61e4a44f1cbab884635d266f9dbaed0fdcc8c9e458a0b720
 SHA512:
-  metadata.gz: a66af847f0dece95ba2e0990433d5dfde52cee08b51b9163f3551269d5c8fd0bc31c2207a45aad23a3d1af19e065482c5871afd4f7014bcd58f10d2b24dae9db
-  data.tar.gz: 5acdcd7e2b3eb9ee375852a6d3539016994e0344a57b1256e33bacaf533fce2fb89c088f3fb7dfb2b96002e10bd8930c9161b9591b17cafced036eb8ae13ae75
+  metadata.gz: ef14ecd365691be385e6378b42beb60bd712687bcd1907e8899b5bb7e3b13b0c1c1a8821570631d7accb047cafeff444210fff7ea72802c036cc3b1d79c1976d
+  data.tar.gz: bf62253ac1e9cc96e6efc3c9d83da3918b479dc4ea904dfc3e0e47a860641cd507376a878c85c6982c9115942e80423a2351d25bebc10800ce904272d06f7520

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

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,6 +28,18 @@ module Resque
       end
     end
 
+    def report_failed_job(job, exception)
+      $SEQ_WRITER.print "failed_job_#{exception.class.name.downcase.gsub('::', '_')}\n"
+    end
+
+    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

@@ -91,11 +91,35 @@ 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_with_severity :debug, "in test_job_limit_sequence_of_events"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-multi-job-forks
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Have your resque workers process more that one job