perfectqueue 0.8.10 → 0.8.11

data/ChangeLog

@@ -1,4 +1,11 @@
 
+== 2012-08-05 version 0.8.11
+
+* Support child_fork_frequency_limit option to wait before forking child
+* Error messages include processor id and pid
+* Don't check child process status if it's killing status is immediate-killing
+
+
 == 2012-08-04 version 0.8.10
 
 * rdb_backend returns max_running attribute

data/lib/perfectqueue/multiprocess/child_process_monitor.rb

@@ -33,6 +33,8 @@ module PerfectQueue
         @rbuf = ''
       end
 
+      attr_reader :pid
+
       def check_heartbeat(limit)
         @rpipe.read_nonblock(1024, @rbuf)
         @last_heartbeat = Time.now.to_i
@@ -53,6 +55,18 @@ module PerfectQueue
         @kill_start_time = now
       end
 
+      def killing_status
+        if @kill_start_time
+          if @kill_immediate
+            return true
+          else
+            return false
+          end
+        else
+          return nil
+        end
+      end
+
       def try_join(kill_interval, graceful_kill_limit)
         return nil unless @kill_start_time
 

data/lib/perfectqueue/multiprocess/fork_processor.rb

@@ -27,6 +27,7 @@ module PerfectQueue
         require 'fcntl'
         @stop = false
         @cpm = nil
+        @last_fork_time = 0
 
         restart(false, config)
       end
@@ -35,6 +36,7 @@ module PerfectQueue
         @child_heartbeat_limit = config[:child_heartbeat_limit] || 10.0
         @child_kill_interval = config[:child_kill_interval] || 2.0
         @child_graceful_kill_limit = config[:child_graceful_kill_limit] || nil
+        @child_fork_frequency_limit = config[:child_fork_frequency_limit] || 5.0
         @log = config[:logger]
         @config = config  # for child process
 
@@ -58,20 +60,23 @@ module PerfectQueue
         end
 
         if c = @cpm
-          begin
-            # receive heartbeat
-            keptalive = c.check_heartbeat(@child_heartbeat_limit)
-            unless keptalive
-              @log.error "Heartbeat broke out. Restarting child process."
+          if c.killing_status != true
+            # don't check status if killing status is immediate-killing
+            begin
+              # receive heartbeat
+              keptalive = c.check_heartbeat(@child_heartbeat_limit)
+              if !keptalive
+                @log.error "Heartbeat broke out. Restarting child process id=#{@processor_id} pid=#{c.pid}."
+                c.start_killing(true)
+              end
+            rescue EOFError
+              @log.error "Heartbeat pipe is closed. Restarting child process id=#{@processor_id} pid=#{c.pid}."
+              c.start_killing(true)
+            rescue
+              @log.error "Unknown error: #{$!.class}: #{$!}: Restarting child process id=#{@processor_id} pid=#{c.pid}."
+              $!.backtrace.each {|bt| @log.warn "\t#{bt}" }
               c.start_killing(false)
             end
-          rescue EOFError
-            @log.error "Heartbeat pipe is closed. Restarting child process."
-            c.start_killing(true)
-          rescue
-            @log.error "Unknown error: #{$!.class}: #{$!}: Restarting child process."
-            $!.backtrace.each {|bt| @log.warn "\t#{bt}" }
-            c.start_killing(false)
           end
 
           try_join
@@ -81,7 +86,7 @@ module PerfectQueue
           begin
             @cpm = fork_child
           rescue
-            @log.error "Failed to fork child process: #{$!.class}: #{$!}"
+            @log.error "Failed to fork child process id=#{@processor_id}: #{$!.class}: #{$!}"
             $!.backtrace.each {|bt| @log.warn "\t#{bt}" }
           end
         end
@@ -116,15 +121,16 @@ module PerfectQueue
         end
       end
 
-      def ensure_fork
-        unless @cpm
-          @cpm = fork_child
-        end
-      end
-
       INTER_FORK_LOCK = Mutex.new
 
       def fork_child
+        now = Time.now.to_f
+        if now - @last_fork_time < @child_fork_frequency_limit
+          @log.info "Tried to fork child #{now-@last_fork_time} seconds ago < #{@child_fork_frequency_limit}. Waiting... id=#{@processor_id}"
+          return nil
+        end
+        @last_fork_time = now
+
         # set process name
         @runner.before_fork if @runner.respond_to?(:before_fork)  # TODO exception handling
 

data/lib/perfectqueue/multiprocess/thread_processor.rb

@@ -69,7 +69,7 @@ module PerfectQueue
       end
 
       def stop(immediate)
-        @log.info immediate ? "Stopping worker thread immediately" : "Stopping worker thread gracefully"
+        @log.info immediate ? "Stopping worker thread immediately id=#{@processor_id}" : "Stopping worker thread gracefully id=#{@processor_id}"
         @tm.stop_task(immediate)
         @finish_flag.set!
       end
@@ -95,14 +95,14 @@ module PerfectQueue
           end
         }
       rescue
-        @log.error "Unknown error #{$!.class}: #{$!}: Exiting worker pid=#{Process.pid}"
+        @log.error "Unknown error #{$!.class}: #{$!}: Exiting worker id=#{@processor_id}"
         $!.backtrace.each {|bt| @log.warn "\t#{bt}" }
       ensure
         @tm.stop
       end
 
       def process(task)
-        @log.info "acquired task: #{task.inspect}"
+        @log.info "acquired task id=#{@processor_id}: #{task.inspect}"
         begin
           r = @runner.new(task)
           @tm.set_task(task, r)
@@ -112,7 +112,7 @@ module PerfectQueue
             @tm.task_finished(task)
           end
         rescue
-          @log.error "process failed: #{$!.class}: #{$!}"
+          @log.error "process failed id=#{@processor_id}: #{$!.class}: #{$!}"
           $!.backtrace.each {|bt| @log.warn "\t#{bt}" }
           raise  # force exit
         end

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.8.10"
+  VERSION = "0.8.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.8.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-04 00:00:00.000000000 Z
+date: 2012-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel