perfectqueue 0.8.1 → 0.8.2

data/ChangeLog

@@ -1,4 +1,14 @@
 
+== 2012-06-29 version 0.8.2
+
+* 'process' type multiprocessor supports max_request_per_child option
+* rdb_compat: heartbeat assumes UPDATE suceeded if 'timeout' is not changed
+in case it was called within 1 second
+* Child process ignores SIGCHLD
+* Fixed Router not to match 'x' routing pattern with 'xy'
+* Fixed child/task heartbeat timing calculation
+
+
 == 2012-06-25 version 0.8.1
 
 * Added autoload for PerfectQueue::VERSION

data/lib/perfectqueue/application/router.rb

@@ -30,7 +30,7 @@ module PerfectQueue
         when Regexp
           # ok
         when String, Symbol
-          pattern = /#{Regexp.escape(pattern)}/
+          pattern = /\A#{Regexp.escape(pattern)}\z/
         else
           raise ArguementError, "pattern should be String or Regexp but got #{pattern.class}: #{pattern.inspect}"
         end

data/lib/perfectqueue/backend/rdb_compat.rb

@@ -213,12 +213,15 @@ SQL
         connect {
           n = @db["UPDATE `#{@table}` SET timeout=? WHERE id=? AND created_at IS NOT NULL;", next_timeout, key].update
           if n <= 0
-            row = @db.fetch("SELECT id, created_at FROM `#{@table}` WHERE id=? LIMIT 1", key).first
+            row = @db.fetch("SELECT id, timeout, created_at FROM `#{@table}` WHERE id=? LIMIT 1", key).first
             if row == nil
-              raise AlreadyFinishedError, "task key=#{key} already finished."
+              raise AlreadyFinishedError, "task key=#{key} does not exist or already finished."
             elsif row[:created_at] == -1
               raise CancelRequestedError, "task key=#{key} is cancel requested."
+            elsif row[:timeout] == next_timeout
+              # ok
             else
+              # row[:created_at] == null
               raise AlreadyFinishedError, "task key=#{key} already finished."
             end
           end

data/lib/perfectqueue/multiprocess/child_process.rb

@@ -27,15 +27,18 @@ module PerfectQueue
       def initialize(runner, config, wpipe)
         @wpipe = wpipe
         @wpipe.sync = true
+        @request_per_child = 0
         super(runner, config)
         @sig = install_signal_handlers
       end
 
+      # override
       def run
         super
         @sig.shutdown
       end
 
+      # override
       def stop(immediate)
         @log.info "Exiting worker pid=#{Process.pid}"
         super
@@ -51,10 +54,12 @@ module PerfectQueue
         # do nothing
       end
 
+      # override
       def logrotated
         @log.reopen!
       end
 
+      # override
       def child_heartbeat
         @wpipe.write HEARTBEAT_PACKET
       rescue
@@ -66,6 +71,23 @@ module PerfectQueue
 
       HEARTBEAT_PACKET = [0].pack('C')
 
+      # override
+      def restart(immediate, config)
+        @max_request_per_child = config[:max_request_per_child] || nil
+        super
+      end
+
+      # override
+      def process(task)
+        super
+        if @max_request_per_child
+          @request_per_child += 1
+          if @request_per_child > @max_request_per_child
+            stop(false)
+          end
+        end
+      end
+
       private
       def install_signal_handlers
         SignalQueue.start do |sig|
@@ -99,6 +121,8 @@ module PerfectQueue
           sig.trap :USR2 do
             logrotated
           end
+
+          trap :CHLD, "SIG_DFL"
         end
       end
     end

data/lib/perfectqueue/multiprocess/fork_processor.rb

@@ -68,7 +68,7 @@ module PerfectQueue
             @log.error "Heartbeat pipe is closed. Restarting child process."
             c.start_killing(true)
           rescue
-            @log.error "Unknown error: #{$!.class}: #{$!}. Restarting child process."
+            @log.error "Unknown error: #{$!.class}: #{$!}: Restarting child process."
             $!.backtrace.each {|bt| @log.warn "\t#{bt}" }
             c.start_killing(false)
           end

data/lib/perfectqueue/multiprocess/thread_processor.rb

@@ -94,7 +94,7 @@ module PerfectQueue
           end
         }
       rescue
-        @log.error "Unknown error #{$!.class}: #{$!}. Exiting worker pid=#{Process.pid}"
+        @log.error "Unknown error #{$!.class}: #{$!}: Exiting worker pid=#{Process.pid}"
         $!.backtrace.each {|bt| @log.warn "\t#{bt}" }
       ensure
         @tm.stop

data/lib/perfectqueue/task_monitor.rb

@@ -115,19 +115,20 @@ module PerfectQueue
             next_task_heartbeat = @last_task_heartbeat + @task_heartbeat_interval
             next_time = [next_child_heartbeat, next_task_heartbeat].min
           else
+            next_task_heartbeat = nil
             next_time = next_child_heartbeat
           end
 
-          next_wait = [1, next_time - now].max
-          @cond.wait(next_wait) if next_wait > 0  # TODO timeout doesn't work?
+          next_wait = next_time - now
+          @cond.wait(next_wait) if next_wait > 0
 
           now = Time.now.to_i
-          if @task && next_task_heartbeat && now <= next_task_heartbeat
+          if @task && next_task_heartbeat && next_task_heartbeat <= now
             task_heartbeat
             @last_task_heartbeat = now
           end
 
-          if now <= next_child_heartbeat
+          if next_child_heartbeat <= now
             @child_heartbeat.call  # will recursive lock
             @last_child_heartbeat = now
           end

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000Z
+date: 2012-06-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70128708982980 !ruby/object:Gem::Requirement
+  requirement: &70175585314980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.26.0
   type: :runtime
   prerelease: false
-  version_requirements: *70128708982980
+  version_requirements: *70175585314980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70128708981280 !ruby/object:Gem::Requirement
+  requirement: &70175571565720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70128708981280
+  version_requirements: *70175571565720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70128708976640 !ruby/object:Gem::Requirement
+  requirement: &70175571565260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70128708976640
+  version_requirements: *70175571565260
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70128708973780 !ruby/object:Gem::Requirement
+  requirement: &70175571564800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *70128708973780
+  version_requirements: *70175571564800
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70128708967780 !ruby/object:Gem::Requirement
+  requirement: &70175571564340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70128708967780
+  version_requirements: *70175571564340
 description: Highly available distributed cron built on RDBMS
 email: frsyuki@gmail.com
 executables: