perfectqueue 0.7.15 → 0.7.16

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2012-01-10 version 0.7.16
+
+* RDBBackend: sleep 0.5 before retrying failed transaction by deadlock
+* RDBBackend: release the row lock acquired by SELECT .. FOR UPDATE before retrying it
+
+
 == 2012-01-10 version 0.7.15
 
 * RDBBackend: Fixed locking routines to work with possibility of deadlocks

data/lib/perfectqueue/backend/rdb.rb

@@ -62,14 +62,15 @@ SQL
         block.call
       rescue
         # workaround for "Mysql2::Error: Deadlock found when trying to get lock; try restarting transaction" error
-        err = ([$!] + $!.backtrace.map {|bt| "  #{bt}" }).join("\n")
         if $!.to_s.include?('try restarting transaction')
+          err = ([$!] + $!.backtrace.map {|bt| "  #{bt}" }).join("\n")
           retry_count += 1
           if retry_count < MAX_RETRY
-            STDERR.puts err + "\nretrying"
+            STDERR.puts err + "\n  retrying."
+            sleep 0.5
             retry
           else
-            STDERR.puts err + "\nabort"
+            STDERR.puts err + "\n  abort."
           end
         end
         raise
@@ -91,9 +92,9 @@ SQL
 
   def acquire(timeout, now=Time.now.to_i)
     connect {
-      @db.transaction do
-        while true
-          rows = 0
+      while true
+        rows = 0
+        @db.transaction do
           @db.fetch(@sql, now, now) {|row|
             unless row[:created_at]
               # finished/canceled task
@@ -110,8 +111,8 @@ SQL
 
             rows += 1
           }
-          break nil if rows < MAX_SELECT_ROW
         end
+        break nil if rows < MAX_SELECT_ROW
       end
     }
   end

data/lib/perfectqueue/version.rb

@@ -1,5 +1,5 @@
 module PerfectQueue
 
-VERSION = '0.7.15'
+VERSION = '0.7.16'
 
 end

data/test/stress.rb

@@ -14,24 +14,24 @@ class StressTest
   end
 
   class ThreadMain < Thread
-    def initialize(key_prefix, db, num, now)
+    def initialize(key_prefix, db, num)
       @key_prefix = key_prefix
       @db = db
       @num = num
-      @now = now
       super(&method(:run))
     end
 
     def run
       @num.times {|i|
-        @db.submit("#{@key_prefix}-#{i}", "data", @now)
-        token, task = @db.acquire(@now+60)
+        now = Time.now.to_i
+        @db.submit("#{@key_prefix}-#{i}", "data", now)
+        token, task = @db.acquire(now+60)
         if token == nil
           puts "acquire failed"
           next
         end
-        @db.update(token, @now+70)
-        @db.finish(token, @now+80)
+        @db.update(token, now+70)
+        @db.finish(token, now+80)
       }
     end
   end
@@ -41,7 +41,7 @@ class StressTest
     key_prefix = "stress-#{'%08x'%rand(2**32)}"
     now = Time.now
     @thread.times {|i|
-      threads << ThreadMain.new("#{key_prefix}-#{i}", @db_proc.call, @npt, now.to_i)
+      threads << ThreadMain.new("#{key_prefix}-#{i}", @db_proc.call, @npt)
     }
     threads.each {|t|
       t.join

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.7.15
+  version: 0.7.16
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &13147240 !ruby/object:Gem::Requirement
+  requirement: &13164680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.26.0
   type: :runtime
   prerelease: false
-  version_requirements: *13147240
+  version_requirements: *13164680
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &13146400 !ruby/object:Gem::Requirement
+  requirement: &13164120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *13146400
+  version_requirements: *13164120
 description: 
 email: frsyuki@gmail.com
 executables: