perfectqueue 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12beb7e5ec6143447d1fbf9a973fa8cb9305c5a0
-  data.tar.gz: 782ca440e9554af177adaf7607b8306a57b0612c
+  metadata.gz: cec4a6907599be03eb95b756075c114c1a282218
+  data.tar.gz: 3cc969e794964142212690c24eef4aab1c45e847
 SHA512:
-  metadata.gz: b6a1a9955411bf1c8fc34be3ad1c3116550107f7b5bd02c56bcd84553716979e73500ef006651beef88614d04bbf8699dc9b8a5b54aee8bb202488f11a55fac6
-  data.tar.gz: d628b629c1538834cb2b6233ca4bb82410800a31386ebc011913e51b1780e92fd47c7597ce67539038e59303a1867ebf3d8423078001bcc7ffe62c48a397636e
+  metadata.gz: 99bbd684d883988af719392e15e37446eec1b7404d1c3a661875156fc4137ab2e6ddf090e706a0c13449a0fc17fcdba1e2d19d54fc3d8db17e018081f3cb4326
+  data.tar.gz: 8f2be0558cf06f6caf6664c7cf77aaddabb3470b632495bfdd0a8790cac72592072e58fd17051fb7a04459c8f5b369a77343f7d50135b8402e5c7ba40c52995d

data/ChangeLog

@@ -1,3 +1,8 @@
+== 2016-09-23 version 0.9.1
+
+* FOR UPDATE is not required while with GET_LOCK() (#54)
+* Retry connect (#44)
+
 == 2016-09-16 version 0.9.0
 
 * Use UPDATE first strategy (#15)

data/bin/stress

@@ -149,7 +149,7 @@ def insert(queue)
 "params":{}}
     begin
       n = Process.clock_gettime(Process::CLOCK_REALTIME, :second)
-      queue.submit("import.1/main.action_#{n}_#{rd.hex(80)}", 'user02', h, now: t)
+      queue.submit("import.1/main.action_#{n}_#{rd.hex(20)}", 'user02', h, now: t)
     rescue
       p $!
       sleep 1
@@ -165,6 +165,7 @@ def worker(queue)
     t0 = t = Process.clock_gettime(Process::CLOCK_REALTIME, :second)
     begin
       ary = queue.poll_multi(max_acquire: 11, now: t)
+      sleep 1
       ary.each do |x|
         x.finish!({})
       end if ary

data/lib/perfectqueue/backend/rdb.rb

@@ -21,6 +21,8 @@ module PerfectQueue::Backend
         host: u.host,
         port: u.port ? u.port.to_i : 3306
       }
+      @pq_connect_timeout = config.fetch(:pq_connect_timeout, 20)
+      options[:connect_timeout] = config.fetch(:connect_timeout, 3)
       options[:sslca] = config[:sslca] if config[:sslca]
       db_name = u.path.split('/')[1]
       @db = Sequel.mysql2(db_name, options)
@@ -54,23 +56,31 @@ module PerfectQueue::Backend
     end
 
     private
-    def connect(&block)
+    def connect
+      tmax = Process.clock_gettime(Process::CLOCK_REALTIME, :second) + @pq_connect_timeout
       @mutex.synchronize do
         retry_count = 0
         begin
-          block.call
+          yield
+        rescue Sequel::DatabaseConnectionError
+          if (retry_count += 1) < MAX_RETRY && tmax > Process.clock_gettime(Process::CLOCK_REALTIME, :second)
+            STDERR.puts "#{$!}\n  retrying."
+            sleep 2
+            retry
+          end
+          STDERR.puts "#{$!}\n  abort."
+          raise
         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")
+            err = $!.backtrace.map{|bt| "  #{bt}" }.unshift($!).join("\n")
             retry_count += 1
             if retry_count < MAX_RETRY
-              STDERR.puts err + "\n  retrying."
+              STDERR.puts "#{err}\n  retrying."
               sleep 0.5
               retry
-            else
-              STDERR.puts err + "\n  abort."
             end
+            STDERR.puts "#{err}\n  abort."
           end
           raise
         ensure

data/lib/perfectqueue/backend/rdb_compat.rb

@@ -39,6 +39,7 @@ module PerfectQueue
       def initialize(client, config)
         super
 
+        @pq_connect_timeout = config.fetch(:pq_connect_timeout, 20)
         url = config[:url]
         @table = config[:table]
         unless @table
@@ -46,7 +47,9 @@ module PerfectQueue
         end
 
         if /\Amysql2:/i =~ url
-          @db = Sequel.connect(url, {max_connections: 1, sslca: config[:sslca]})
+          options = {max_connections: 1, sslca: config[:sslca]}
+          options[:connect_timeout] = config.fetch(:connect_timeout, 3)
+          @db = Sequel.connect(url, options)
           if config.fetch(:use_connection_pooling, nil) != nil
             @use_connection_pooling = !!config[:use_connection_pooling]
           else
@@ -91,7 +94,7 @@ UPDATE `#{@table}`
     FROM `#{@table}` FORCE INDEX (`index_#{@table}_on_timeout`)
    WHERE #{EVENT_HORIZON} < timeout AND timeout <= :now
    ORDER BY timeout ASC
-      LIMIT :max_acquire FOR UPDATE) AS t1 USING(id)
+      LIMIT :max_acquire) AS t1 USING(id)
    SET timeout=:next_timeout, owner=CONNECTION_ID()
 SQL
           @sql = <<SQL
@@ -110,12 +113,10 @@ UPDATE `#{@table}`
       FROM `#{@table}` AS t1
       WHERE timeout > :now AND resource IS NOT NULL
       GROUP BY resource
-      FOR UPDATE
     ) AS t2 USING(resource)
     WHERE #{EVENT_HORIZON} < timeout AND timeout <= :now AND IFNULL(max_running - running, 1) > 0
     ORDER BY weight DESC, timeout ASC
     LIMIT :max_acquire
-    FOR UPDATE
   ) AS t3 USING (id)
 SET timeout = :next_timeout, owner = CONNECTION_ID()
 SQL
@@ -257,6 +258,7 @@ SQL
           if n <= 0
             return nil
           end
+          @table_unlock.call
 
           tasks = []
           @db.fetch(@sql, next_timeout) {|row|
@@ -329,7 +331,7 @@ SQL
       end
 
       protected
-      def connect_locked(&block)
+      def connect_locked
         connect {
           locked = false
 
@@ -339,7 +341,7 @@ SQL
               locked = true
             end
 
-            return block.call
+            return yield
           ensure
             if @use_connection_pooling && locked
               @table_unlock.call
@@ -348,16 +350,25 @@ SQL
         }
       end
 
-      def connect(&block)
+      def connect
         now = Time.now.to_i
+        tmax = now + @pq_connect_timeout
         @mutex.synchronize do
           # keepalive_timeout
           @db.disconnect if now - @last_time > KEEPALIVE
 
           count = 0
           begin
-            block.call
+            yield
             @last_time = now
+          rescue Sequel::DatabaseConnectionError
+            if (count += 1) < MAX_RETRY && tmax > Time.now.to_i
+              STDERR.puts "#{$!}\n  retrying."
+              sleep 2
+              retry
+            end
+            STDERR.puts "#{$!}\n  abort."
+            raise
           rescue
             # workaround for "Mysql2::Error: Deadlock found when trying to get lock; try restarting transaction" error
             if $!.to_s.include?('try restarting transaction')

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/spec/rdb_backend_spec.rb

@@ -69,5 +69,19 @@ describe Backend::RDBBackend do
         end.to raise_error(RuntimeError)
       end
     end
+    context 'cannot connect' do
+      let (:uri){ 'mysql2://root:@nonexistent/perfectqueue_test' }
+      let (:db) do
+        Backend::RDBBackend.new(uri, table)
+      end
+      it 'raises Sequel::DatabaseConnectionError' do
+        allow(STDERR).to receive(:puts)
+        slept = 0
+        expect(db).to receive(:sleep).exactly(9).times{|n| slept += n }
+        expect(db.db).to receive(:connect).exactly(10).times.and_call_original
+        expect{ db.__send__(:connect){ db.db.run('SELECT 1;') } }.to raise_error(Sequel::DatabaseConnectionError)
+        expect(slept).to be < 30
+      end
+    end
   end
 end

data/spec/rdb_compat_backend_spec.rb

@@ -338,6 +338,18 @@ describe Backend::RDBCompatBackend do
           end
         end.to raise_error(RuntimeError)
       end
+      context 'cannot connect' do
+        let (:config){ {url: 'mysql2://root:@nonexistent/perfectqueue_test', table: table} }
+        it 'raises Sequel::DatabaseConnectionError' do
+          allow(STDERR).to receive(:puts)
+          d = Backend::RDBCompatBackend.new(client, config)
+          slept = 0
+          expect(d).to receive(:sleep).exactly(9).times{|n| slept += n }
+          expect(d.db).to receive(:connect).exactly(10).times.and_call_original
+          expect{ d.__send__(:connect){ d.db.run('SELECT 1;') } }.to raise_error(Sequel::DatabaseConnectionError)
+          expect(slept).to eq(18)
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel