redis_failover 0.8.7 → 0.8.8

data/Changes.md

@@ -1,3 +1,8 @@
+0.8.8
+-----------
+- Use a stack for handling nested blocks in RedisFailover::Client (inspired by connection_pool gem)
+- Fix an issue with #multi and Redis 3.x.
+
 0.8.7
 -----------
 - Support TTL operation (#24)

data/lib/redis_failover/client.rb

@@ -105,7 +105,9 @@ module RedisFailover
       @max_retries = @retry ? options.fetch(:max_retries, 3) : 0
       @master = nil
       @slaves = []
+      @node_addresses = {}
       @lock = Monitor.new
+      @current_client_key = "current-client-#{self.object_id}"
       setup_zk
       build_clients
     end
@@ -228,11 +230,7 @@ module RedisFailover
         end
         raise
       ensure
-        if info = Thread.current[:last_operation_info]
-          if info[:method] == method
-            Thread.current[:last_operation_info] = nil
-          end
-        end
+        free_client
       end
     end
 
@@ -312,6 +310,7 @@ module RedisFailover
         if @namespace
           client = Redis::Namespace.new(@namespace, :redis => client)
         end
+        @node_addresses[client] = node
         client
       end
     end
@@ -364,7 +363,7 @@ module RedisFailover
     # @return [String] the address for the node
     def address_for(node)
       return unless node
-      "#{node.client.host}:#{node.client.port}"
+      @node_addresses[node]
     end
 
     # Determines if the currently known redis servers is different
@@ -400,6 +399,7 @@ module RedisFailover
         disconnect(@master, *@slaves)
         @master = nil
         @slaves = []
+        @node_addresses = {}
       end
     end
 
@@ -414,32 +414,27 @@ module RedisFailover
       Time.now - @last_znode_timestamp <= ZNODE_UPDATE_TIMEOUT
     end
 
-    # Returns the client to use for the specified operation.
+    # Acquires a client to use for the specified operation.
     #
     # @param [Symbol] method the method for which to retrieve a client
     # @return [Redis] a redis client to use
     # @note
-    #   This method stores the last client/method used to handle the case
-    #   where the same RedisFailover::Client instance is referenced by a
-    #   block passed to multi.
+    #   This method stores a stack of clients used to handle the case
+    #   where the same RedisFailover::Client instance is referenced by
+    #   nested blocks (e.g., block passed to multi).
     def client_for(method)
-      if info = Thread.current[:last_operation_info]
-        return info[:client]
-      elsif REDIS_READ_OPS.include?(method)
-        # send read operations to a slave
-        Thread.current[:last_operation_info] = {
-          :client => slave,
-          :method => method
-        }
-      else
-        # direct everything else to master
-        Thread.current[:last_operation_info] = {
-          :client => master,
-          :method => method
-        }
-      end
+      stack = Thread.current[@current_client_key] ||= []
+      client = stack.last || (REDIS_READ_OPS.include?(method) ? slave : master)
+      stack << client
+      client
+    end
 
-      Thread.current[:last_operation_info][:client]
+    # Pops a client from the thread-local client stack.
+    def free_client
+      if stack = Thread.current[@current_client_key]
+        stack.pop
+      end
+      nil
     end
   end
 end

data/lib/redis_failover/version.rb

@@ -1,3 +1,3 @@
 module RedisFailover
-  VERSION = '0.8.7'
+  VERSION = '0.8.8'
 end

data/spec/node_spec.rb

@@ -67,7 +67,7 @@ module RedisFailover
         thread = Thread.new { node.wait }
         thread.should be_alive
         node.wakeup
-        sleep 0.2
+        sleep 2
         thread.should_not be_alive
         thread.value.should be_nil
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_failover
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -181,12 +181,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1682617654026329056
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1682617654026329056
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23