perfectqueue 0.8.22 → 0.8.23

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2013-01-03 version 0.8.23
+
+* rdb_compat: added retry_count field
+* Added Backend#release
+
+
 == 2012-10-22 version 0.8.22
 
 * rdb_compat backend fixed heartbeat method to check created_at properly

data/lib/perfectqueue/backend/rdb_compat.rb

@@ -45,7 +45,7 @@ module PerfectQueue
 
         if config[:disable_resource_limit]
           @sql = <<SQL
-SELECT id, timeout, data, created_at, resource
+SELECT id, timeout, data, created_at, retry_count, resource
 FROM `#{@table}`
 WHERE timeout <= ? AND timeout <= ? AND created_at IS NOT NULL
 ORDER BY timeout ASC
@@ -53,7 +53,7 @@ LIMIT ?
 SQL
         else
           @sql = <<SQL
-SELECT id, timeout, data, created_at, resource, max_running, max_running/running AS weight
+SELECT id, timeout, data, created_at, retry_count, resource, max_running, max_running/running AS weight
 FROM `#{@table}`
 LEFT JOIN (
   SELECT resource AS res, COUNT(1) AS running
@@ -100,6 +100,7 @@ SQL
               timeout INT NOT NULL,
               data BLOB NOT NULL,
               created_at INT,
+              retry_count INT NOT NULL DEFAULT 0,
               resource VARCHAR(256),
               max_running INT,
               PRIMARY KEY (id)
@@ -114,7 +115,7 @@ SQL
         now = (options[:now] || Time.now).to_i
 
         connect {
-          row = @db.fetch("SELECT timeout, data, created_at, resource, max_running FROM `#{@table}` WHERE id=? LIMIT 1", key).first
+          row = @db.fetch("SELECT timeout, data, created_at, retry_count, resource, max_running FROM `#{@table}` WHERE id=? LIMIT 1", key).first
           unless row
             raise NotFoundError, "task key=#{key} does no exist"
           end
@@ -133,8 +134,8 @@ SQL
         now = (options[:now] || Time.now).to_i
 
         connect {
-          #@db.fetch("SELECT id, timeout, data, created_at, resource FROM `#{@table}` WHERE !(created_at IS NULL AND timeout <= ?) ORDER BY timeout ASC;", now) {|row|
-          @db.fetch("SELECT id, timeout, data, created_at, resource, max_running FROM `#{@table}` ORDER BY timeout ASC", now) {|row|
+          #@db.fetch("SELECT id, timeout, data, created_at, retry_count, resource FROM `#{@table}` WHERE !(created_at IS NULL AND timeout <= ?) ORDER BY timeout ASC;", now) {|row|
+          @db.fetch("SELECT id, timeout, data, created_at, retry_count, resource, max_running FROM `#{@table}` ORDER BY timeout ASC", now) {|row|
             attributes = create_attributes(now, row)
             task = TaskWithMetadata.new(@client, row[:id], attributes)
             yield task
@@ -200,7 +201,7 @@ SQL
               return nil
             end
 
-            sql = "UPDATE `#{@table}` SET timeout = ? WHERE id IN ("
+            sql = "UPDATE `#{@table}` SET timeout=?, retry_count=(retry_count+1) WHERE id IN ("
             params = [sql, next_timeout]
             tasks.each {|t| params << t.key }
             sql << (1..tasks.size).map { '?' }.join(',')
@@ -274,6 +275,10 @@ SQL
         nil
       end
 
+      def release(task_token, alive_time, options)
+        heartbeat(task_token, alive_time, options)
+      end
+
       protected
       def connect(&block)
         #now = Time.now.to_i
@@ -282,15 +287,15 @@ SQL
           #  @db.disconnect
           #end
           #@last_time = now
-          retry_count = 0
+          count = 0
           begin
             block.call
           rescue
             # workaround for "Mysql2::Error: Deadlock found when trying to get lock; try restarting transaction" error
             if $!.to_s.include?('try restarting transaction')
               err = ([$!] + $!.backtrace.map {|bt| "  #{bt}" }).join("\n")
-              retry_count += 1
-              if retry_count < MAX_RETRY
+              count += 1
+              if count < MAX_RETRY
                 STDERR.puts err + "\n  retrying."
                 sleep rand
                 retry
@@ -342,6 +347,7 @@ SQL
           :type => type,
           :user => row[:resource],
           :timeout => row[:timeout],
+          :retry_count => row[:retry_count],
           :max_running => row[:max_running],
           :message => nil,  # not supported
           :node => nil,  # not supported

data/lib/perfectqueue/client.rb

@@ -99,13 +99,13 @@ module PerfectQueue
     def release(task_token, options={})
       alive_time = options[:alive_time] || 0
 
-      @backend.heartbeat(task_token, alive_time, options)
+      @backend.release(task_token, alive_time, options)
     end
 
     def retry(task_token, options={})
       alive_time = options[:retry_wait] || @retry_wait
 
-      @backend.heartbeat(task_token, alive_time, options)
+      @backend.release(task_token, alive_time, options)
     end
 
     def close

data/lib/perfectqueue/task_metadata.rb

@@ -40,6 +40,10 @@ module PerfectQueue
       @attributes[:user]
     end
 
+    def retry_count
+      @attributes[:retry_count]
+    end
+
     def created_at
       if t = @attributes[:created_at]
         return Time.at(t)

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.8.22"
+  VERSION = "0.8.23"
 end

data/spec/queue_spec.rb

@@ -39,19 +39,22 @@ describe Queue do
     task01.finished?.should == false
     task01.type == 'type1'
     task01.key.should == 'task01'
+    task01.retry_count.should == 0
     task01.data["a"].should == 1
 
-    t2 = a.shift
-    t2.finished?.should == false
-    t2.type == 'type1'
-    t2.key.should == 'task02'
-    t2.data["a"].should == 2
+    task02 = a.shift
+    task02.finished?.should == false
+    task02.type == 'type1'
+    task02.key.should == 'task02'
+    task01.retry_count.should == 0
+    task02.data["a"].should == 2
 
-    t3 = a.shift
-    t3.finished?.should == false
-    t3.type == 'type1'
-    t3.key.should == 'task03'
-    t3.data["a"].should == 3
+    task03 = a.shift
+    task03.finished?.should == false
+    task03.type == 'type1'
+    task03.key.should == 'task03'
+    task01.retry_count.should == 0
+    task03.data["a"].should == 3
 
     a.empty?.should == true
   end
@@ -65,11 +68,11 @@ describe Queue do
     task01 = queue.poll(:now=>now+10)
     task01.key.should == 'task01'
 
-    t2 = queue.poll(:now=>now+10)
-    t2.key.should == 'task02'
+    task02 = queue.poll(:now=>now+10)
+    task02.key.should == 'task02'
 
-    t3 = queue.poll(:now=>now+10)
-    t3.key.should == 'task03'
+    task03 = queue.poll(:now=>now+10)
+    task03.key.should == 'task03'
 
     t4 = queue.poll(:now=>now+10)
     t4.should == nil
@@ -81,14 +84,16 @@ describe Queue do
 
     task01 = queue.poll(:now=>now+10)
     task01.key.should == 'task01'
+    task01.retry_count.should == 0
 
-    t2 = queue.poll(:now=>now+10)
-    t2.should == nil
+    task02 = queue.poll(:now=>now+10)
+    task02.should == nil
 
     task01.release!(:now=>now+10)
 
-    t3 = queue.poll(:now=>now+11)
-    t3.key.should == 'task01'
+    task03 = queue.poll(:now=>now+11)
+    task03.key.should == 'task01'
+    task03.retry_count.should == 1
   end
 
   it 'timeout' do
@@ -97,12 +102,14 @@ describe Queue do
 
     task01 = queue.poll(:now=>now+10, :alive_time=>10)
     task01.key.should == 'task01'
+    task01.retry_count.should == 0
 
-    t2 = queue.poll(:now=>now+15)
-    t2.should == nil
+    task02 = queue.poll(:now=>now+15)
+    task02.should == nil
 
-    t3 = queue.poll(:now=>now+20)
-    t3.key.should == 'task01'
+    task03 = queue.poll(:now=>now+20)
+    task03.key.should == 'task01'
+    task03.retry_count.should == 1
   end
 
   it 'heartbeat' do
@@ -111,14 +118,16 @@ describe Queue do
 
     task01 = queue.poll(:now=>now+10, :alive_time=>10)
     task01.key.should == 'task01'
+    task01.retry_count.should == 0
 
     task01.heartbeat!(:alive_time=>15, :now=>now+10)
 
-    t2 = queue.poll(:now=>now+20)
-    t2.should == nil
+    task02 = queue.poll(:now=>now+20)
+    task02.should == nil
 
-    t3 = queue.poll(:now=>now+30)
-    t3.key.should == 'task01'
+    task03 = queue.poll(:now=>now+30)
+    task03.key.should == 'task01'
+    task03.retry_count.should == 1
   end
 
   it 'retry' do
@@ -127,14 +136,16 @@ describe Queue do
 
     task01 = queue.poll(:now=>now+10, :alive_time=>10)
     task01.key.should == 'task01'
+    task01.retry_count.should == 0
 
     task01.retry!(:retry_wait=>15, :now=>now+10)
 
-    t2 = queue.poll(:now=>now+20)
-    t2.should == nil
+    task02 = queue.poll(:now=>now+20)
+    task02.should == nil
 
-    t3 = queue.poll(:now=>now+30)
-    t3.key.should == 'task01'
+    task03 = queue.poll(:now=>now+30)
+    task03.key.should == 'task01'
+    task03.retry_count.should == 1
   end
 
   it 'froce_finish' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.8.22
+  version: 0.8.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel