roundhouse-x 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e419459121a0e984bdeb39afef3442ff962a37a9
-  data.tar.gz: 8781d7c6f13f23bdc40c2a30311ac73d26476b07
+  metadata.gz: 467e42604542c9f936577bc980fc0432b3a8aaa1
+  data.tar.gz: 5608c37e8253f723a3e89902a99ab6b1c64b94f9
 SHA512:
-  metadata.gz: 5648e6e5e86ab1e55b5c5e1a6e6f3eb2f660ed7013dc67b9e6b6ebf9910ebf9e2f2b2a5f375b94528c44c9b54d61d4b61e2a3c57510211e1d7aba38e2054ac1b
-  data.tar.gz: 0b8591db28a22914c1eb5e1c0ca65fc90988e6f3b91ac623f07c1c2cca86453f03396112696bce5b0ff64fb1d13592e061266407d30909114aa98258a210f63f
+  metadata.gz: 999609bebfdc6f4d22bdf15ddb41bc736086d660316509d14e7b18f7c1fdce6cee620cf462970531111ab6ac057f90bac8f232cd88ee6f5f544e69063f0859d0
+  data.tar.gz: ce01b38302d771bd73a96021733b45a45c7f21bc6c39c94965e467fa58362b8295784afda7dbcb13916a4f08b7899e215807f40f94416db23d85dd6a61ca952e

data/lib/roundhouse-x.rb

@@ -0,0 +1 @@
+require 'roundhouse'

data/lib/roundhouse.rb

@@ -74,9 +74,19 @@ module Roundhouse
     defined?(Roundhouse::CLI)
   end
 
-  def self.redis(&block)
-    raise ArgumentError, "requires a block" unless block
-    redis_pool.with(&block)
+  def self.redis
+    raise ArgumentError, "requires a block" unless block_given?
+    redis_pool.with do |conn|
+      retryable = true
+      begin
+        yield conn
+      rescue Redis::CommandError => ex
+        #2550 Failover can cause the server to become a slave, need
+        # to disconnect and reopen the socket to get back to the master.
+        (conn.disconnect!; retryable = false; retry) if retryable && ex.message =~ /READONLY/
+        raise
+      end
+    end
   end
 
   def self.redis_pool

data/lib/roundhouse/manager.rb

@@ -132,7 +132,7 @@ module Roundhouse
     # get handle to the underlying thread performing work for a processor
     # so we have it call us and tell us.
     def real_thread(proxy_id, thr)
-      @threads[proxy_id] = thr
+      @threads[proxy_id] = thr if thr.alive?
     end
 
     PROCTITLES = [

data/lib/roundhouse/monitor.rb

@@ -132,6 +132,7 @@ module Roundhouse
 
           conn.multi do
             conn.del(TURNTABLE)
+            conn.del(IN_ROTATION)
             queue_len.each do |(q_id, len)|
               s = status[q_id].to_i
 

data/lib/roundhouse/processor.rb

@@ -41,18 +41,20 @@ module Roundhouse
 
       @boss.async.real_thread(proxy_id, Thread.current)
 
-      ack = true
+      ack = false
       begin
         msg = Roundhouse.load_json(msgstr)
-        klass  = msg['class'].constantize
+        klass  = msg['class'.freeze].constantize
         worker = klass.new
-        worker.jid = msg['jid']
+        worker.jid = msg['jid'.freeze]
 
         stats(worker, msg, queue) do
           Roundhouse.server_middleware.invoke(worker, msg, queue) do
-            execute_job(worker, cloned(msg['args']))
+            ack = true
+            execute_job(worker, cloned(msg['args'.freeze]))
           end
         end
+        ack = true
       rescue Roundhouse::Shutdown
         # Had to force kill this job because it didn't finish
         # within the timeout.  Don't acknowledge the work since
@@ -97,14 +99,16 @@ module Roundhouse
         end
       end
 
+      nowdate = Time.now.utc.strftime("%Y-%m-%d".freeze)
       begin
         yield
       rescue Exception
         retry_and_suppress_exceptions do
           failed = "stat:failed:#{Time.now.utc.to_date}"
+          failed = "stat:failed:#{nowdate}"
           Roundhouse.redis do |conn|
             conn.multi do
-              conn.incrby("stat:failed", 1)
+              conn.incrby("stat:failed".freeze, 1)
               conn.incrby(failed, 1)
               conn.expire(failed, STATS_TIMEOUT)
             end
@@ -113,11 +117,11 @@ module Roundhouse
         raise
       ensure
         retry_and_suppress_exceptions do
-          processed = "stat:processed:#{Time.now.utc.to_date}"
+          processed = "stat:processed:#{nowdate}"
           Roundhouse.redis do |conn|
             conn.multi do
               conn.hdel("#{identity}:workers", thread_identity)
-              conn.incrby("stat:processed", 1)
+              conn.incrby("stat:processed".freeze, 1)
               conn.incrby(processed, 1)
               conn.expire(processed, STATS_TIMEOUT)
             end

data/lib/roundhouse/version.rb

@@ -1,3 +1,3 @@
 module Roundhouse
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

data/roundhouse.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency                  'redis', '~> 3.2', '>= 3.2.1'
   gem.add_dependency                  'redis-namespace', '~> 1.5', '>= 1.5.2'
   gem.add_dependency                  'connection_pool', '~> 2.2', '>= 2.2.0'
-  gem.add_dependency                  'celluloid', '~> 0.17.0'
+  gem.add_dependency                  'celluloid', '~> 0.17.2'
   gem.add_dependency                  'json', '~> 1.0'
   gem.add_dependency                  'wolverine', '~> 0.3.3'
   gem.add_development_dependency      'sinatra', '~> 1.4', '>= 1.4.6'

data/test/test_roundhouse.rb

@@ -84,4 +84,24 @@ class TestRoundhouse < Roundhouse::Test
       assert_includes output, "ERROR"
     end
   end
+
+  describe 'redis connection' do
+    it 'does not continually retry' do
+      assert_raises Redis::CommandError do
+        Roundhouse.redis do |c|
+          raise Redis::CommandError, "READONLY You can't write against a read only slave."
+        end
+      end
+    end
+
+    it 'reconnects if connection is flagged as readonly' do
+      counts = []
+      Roundhouse.redis do |c|
+        counts << c.info['total_connections_received'].to_i
+        raise Redis::CommandError, "READONLY You can't write against a read only slave." if counts.size == 1
+      end
+      assert_equal 2, counts.size
+      assert_equal counts[0] + 1, counts[1]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roundhouse-x
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ho-Sheng Hsiao
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -77,14 +77,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.17.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.17.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +211,7 @@ files:
 - lib/generators/roundhouse/templates/worker_spec.rb.erb
 - lib/generators/roundhouse/templates/worker_test.rb.erb
 - lib/generators/roundhouse/worker_generator.rb
+- lib/roundhouse-x.rb
 - lib/roundhouse.rb
 - lib/roundhouse/actor.rb
 - lib/roundhouse/api.rb
@@ -384,7 +385,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Round-robin load-balanced background processing for Ruby
@@ -416,4 +417,3 @@ test_files:
 - test/test_util.rb
 - test/test_web.rb
 - test/test_web_helpers.rb
-has_rdoc: