redis_failover 0.5.3 → 0.5.4

data/Changes.md

@@ -1,3 +1,7 @@
+0.5.4
+-----------
+- No longer use problematic ZK#reopen.
+
 0.5.3
 -----------
 - Handle more ZK exceptions as candidates for reconnecting the client on error.

data/lib/redis_failover/client.rb

@@ -109,37 +109,37 @@ module RedisFailover
     private
 
     def setup_zookeeper_client
-      @zkclient = ZkClient.new(@zkservers)
-      update_znode_timestamp
-
-      # when session expires, purge client list
-      @zkclient.on_session_expiration do
-        purge_clients
-      end
+      @zkclient = ZkClient.new(@zkservers) do |client|
+        # when session expires, purge client list
+        client.on_session_expiration do
+          purge_clients
+        end
 
-      # when we are disconnected, purge client list
-      @zkclient.event_handler.register_state_handler(:connecting) do
-        purge_clients
-      end
+        # when we are disconnected, purge client list
+        client.event_handler.register_state_handler(:connecting) do
+          purge_clients
+        end
 
-      # when session is recovered, watch again
-      @zkclient.on_session_recovered do
-        @zkclient.stat(@znode, :watch => true)
-      end
+        # when session is recovered, watch again
+        client.on_session_recovered do
+          client.stat(@znode, :watch => true)
+        end
 
-      # register a watcher for future changes
-      @zkclient.watcher.register(@znode) do |event|
-        if event.node_created? || event.node_changed?
-          update_znode_timestamp
-          build_clients
-        elsif event.node_deleted?
-          update_znode_timestamp
-          purge_clients
-          @zkclient.stat(@znode, :watch => true)
-        else
-          logger.error("Unknown ZK node event: #{event.inspect}")
+        # register a watcher for future changes
+        client.watcher.register(@znode) do |event|
+          if event.node_created? || event.node_changed?
+            update_znode_timestamp
+            build_clients
+          elsif event.node_deleted?
+            update_znode_timestamp
+            purge_clients
+            client.stat(@znode, :watch => true)
+          else
+            logger.error("Unknown ZK node event: #{event.inspect}")
+          end
         end
       end
+      update_znode_timestamp
     end
 
     def redis_operation?(method)
@@ -177,8 +177,7 @@ module RedisFailover
     end
 
     def master
-      master = @lock.synchronize { @master }
-      if master
+      if master = @lock.synchronize { @master }
         verify_role!(master, :master)
         return master
       end

data/lib/redis_failover/node.rb

@@ -52,7 +52,7 @@ module RedisFailover
       perform_operation do |redis|
         unless slave_of?(master)
           redis.slaveof(master.host, master.port)
-          logger.info("#{self} now a slave of master #{master}")
+          logger.info("#{self} is now a slave of master #{master}")
           wakeup
         end
       end

data/lib/redis_failover/node_manager.rb

@@ -86,9 +86,9 @@ module RedisFailover
     def handle_syncing(node)
       reconcile(node)
 
-      if node.prohibits_stale_reads?
+      if node.syncing_with_master? && node.prohibits_stale_reads?
         logger.info("Node #{node} not ready yet, still syncing with master.")
-        @unavailable << node
+        force_unavailable_slave(node)
         return
       end
 
@@ -119,45 +119,46 @@ module RedisFailover
       nodes = @options[:nodes].map { |opts| Node.new(opts) }.uniq
       raise NoMasterError unless @master = find_master(nodes)
       @slaves = nodes - [@master]
+      logger.info("Managing master (#{@master}) and slaves" +
+        " (#{@slaves.map(&:to_s).join(', ')})")
 
       # ensure that slaves are correctly pointing to this master
       redirect_slaves_to_master
-
-      logger.info("Managing master (#{@master}) and slaves" +
-        " (#{@slaves.map(&:to_s).join(', ')})")
     end
 
     def spawn_watchers
-      @watchers = [@master, *@slaves].map do |node|
+      @watchers = [@master, @slaves, @unavailable].flatten.map do |node|
         NodeWatcher.new(self, node,  @options[:max_failures] || 3)
       end
       @watchers.each(&:watch)
     end
 
     def find_master(nodes)
-      # try to find the master - if the actual master is currently
-      # down, it will be handled by its watcher
       nodes.find do |node|
         begin
           node.master?
         rescue NodeUnavailableError
-          # will eventually be handled by watcher
           false
         end
       end
     end
 
     def redirect_slaves_to_master
-      # redirect each slave to the current master
-      @slaves.each do |slave|
+      @slaves.dup.each do |slave|
         begin
           slave.make_slave!(@master)
         rescue NodeUnavailableError
-          # will also be detected by watcher
+          logger.info("Failed to redirect unreachable slave #{slave} to master #{@master}")
+          force_unavailable_slave(slave)
         end
       end
     end
 
+    def force_unavailable_slave(node)
+      @slaves.delete(node)
+      @unavailable << node unless @unavailable.include?(node)
+    end
+
     # It's possible that a newly available node may have been restarted
     # and completely lost its dynamically set run-time role by the node
     # manager. This method ensures that the node resumes its role as

data/lib/redis_failover/version.rb

@@ -1,3 +1,3 @@
 module RedisFailover
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/lib/redis_failover/zk_client.rb

@@ -15,9 +15,18 @@ module RedisFailover
       ZookeeperExceptions::ZookeeperException::ConnectionClosed,
       ZookeeperExceptions::ZookeeperException::NotConnected
     ].freeze
+    WRAPPED_ZK_METHODS = [
+      :get,
+      :set,
+      :watcher,
+      :event_handler,
+      :stat,
+      :create,
+      :delete].freeze
 
-    def initialize(servers)
+    def initialize(servers, &setup_block)
       @servers = servers
+      @setup_block = setup_block
       @lock = Mutex.new
       build_client
     end
@@ -32,32 +41,14 @@ module RedisFailover
       @on_session_recovered = block
     end
 
-    def get(*args, &block)
-      perform_with_reconnect { @client.get(*args, &block) }
-    end
-
-    def set(*args, &block)
-      perform_with_reconnect { @client.set(*args, &block) }
-    end
-
-    def watcher(*args, &block)
-      perform_with_reconnect { @client.watcher(*args, &block) }
-    end
-
-    def event_handler(*args, &block)
-      perform_with_reconnect { @client.event_handler(*args, &block) }
-    end
-
-    def stat(*args, &block)
-      perform_with_reconnect { @client.stat(*args, &block) }
-    end
-
-    def create(*args, &block)
-      perform_with_reconnect { @client.create(*args, &block) }
-    end
-
-    def delete(*args, &block)
-      perform_with_reconnect { @client.delete(*args, &block) }
+    WRAPPED_ZK_METHODS.each do |zk_method|
+      class_eval <<-RUBY
+        def #{zk_method}(*args, &block)
+          perform_with_reconnect do
+            @client.#{zk_method}(*args, &block)
+          end
+        end
+      RUBY
     end
 
     private
@@ -83,11 +74,8 @@ module RedisFailover
 
     def build_client
       @lock.synchronize do
-        if @client
-          @client.reopen
-        else
-          @client = ZK.new(@servers)
-        end
+        @client = ZK.new(@servers)
+        @setup_block.call(self) if @setup_block
         logger.info("Communicating with ZooKeeper servers #{@servers}")
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_failover
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70306532639260 !ruby/object:Gem::Requirement
+  requirement: &70362366935580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306532639260
+  version_requirements: *70362366935580
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70306532638840 !ruby/object:Gem::Requirement
+  requirement: &70362366935160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306532638840
+  version_requirements: *70362366935160
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70306532638420 !ruby/object:Gem::Requirement
+  requirement: &70362366934740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306532638420
+  version_requirements: *70362366934740
 - !ruby/object:Gem::Dependency
   name: zk
-  requirement: &70306532638000 !ruby/object:Gem::Requirement
+  requirement: &70362366934320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306532638000
+  version_requirements: *70362366934320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70306532637580 !ruby/object:Gem::Requirement
+  requirement: &70362366933900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306532637580
+  version_requirements: *70362366933900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70306532637160 !ruby/object:Gem::Requirement
+  requirement: &70362366933480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306532637160
+  version_requirements: *70362366933480
 description: Redis Failover is a ZooKeeper-based automatic master/slave failover solution
   for Ruby
 email:
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4476900958412029501
+      hash: 610999762978001666
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4476900958412029501
+      hash: 610999762978001666
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16