redis_failover 0.9.0 → 0.9.1

data/Changes.md

@@ -1,3 +1,9 @@
+0.9.1
+-----------
+- Improve nested exception handling.
+- Fix manual failover support when znode does not exist first.
+- Various fixes to work better with 1.8.7.
+
 0.9.0
 -----------
 - Make Node Manager's lock path vary with its main znode. (Bira)

data/README.md

@@ -175,6 +175,7 @@ redis_failover uses YARD for its API documentation. Refer to the generated [API
 - To learn more about ZooKeeper, see the official [ZooKeeper](http://zookeeper.apache.org/) site.
 - See the [Quick ZooKeeper Guide](https://github.com/ryanlecompte/redis_failover/wiki/Quick-ZooKeeper-Guide) for a quick guide to getting ZooKeeper up and running with redis_failover.
 - To learn more about how ZooKeeper handles network partitions, see [ZooKeeper Failure Scenarios](http://wiki.apache.org/hadoop/ZooKeeper/FailureScenarios)
+- Feel free to join #zk on the IRC freenode network. We're usually hanging out there talking about ZooKeeper and redis_failover.
 
 
 ## License

data/lib/redis_failover/client.rb

@@ -177,6 +177,8 @@ module RedisFailover
       else
         logger.error("Unknown ZK node event: #{event.inspect}")
       end
+    ensure
+      @zk.stat(@znode, :watch => true)
     end
 
     # Determines if a method is a known redis operation.
@@ -237,7 +239,7 @@ module RedisFailover
     # @raise [NoMasterError] if no master fallback is available
     def slave
       # pick a slave, if none available fallback to master
-      if slave = @lock.synchronize { @slaves.sample }
+      if slave = @lock.synchronize { @slaves.shuffle.first }
         verify_role!(slave, :slave)
         return slave
       end
@@ -253,7 +255,7 @@ module RedisFailover
           return unless nodes_changed?(nodes)
 
           purge_clients
-          logger.info("Building new clients for nodes #{nodes}")
+          logger.info("Building new clients for nodes #{nodes.inspect}")
           new_master = new_clients_for(nodes[:master]).first if nodes[:master]
           new_slaves = new_clients_for(*nodes[:slaves])
           @master = new_master
@@ -287,7 +289,7 @@ module RedisFailover
     def fetch_nodes
       data = @zk.get(@znode, :watch => true).first
       nodes = symbolize_keys(decode(data))
-      logger.debug("Fetched nodes: #{nodes}")
+      logger.debug("Fetched nodes: #{nodes.inspect}")
 
       nodes
     rescue Zookeeper::Exceptions::InheritedConnectionError => ex

data/lib/redis_failover/node.rb

@@ -175,14 +175,14 @@ module RedisFailover
         redis = new_client
         yield redis
       end
-    rescue
-      raise NodeUnavailableError, self, caller
+    rescue => ex
+      raise NodeUnavailableError, "#{ex.class}: #{ex.message}", ex.backtrace
     ensure
       if redis
         begin
           redis.client.disconnect
-        rescue
-          raise NodeUnavailableError, self, caller
+        rescue => ex
+          raise NodeUnavailableError, "#{ex.class}: #{ex.message}", ex.backtrace
         end
       end
     end

data/lib/redis_failover/node_manager.rb

@@ -87,8 +87,15 @@ module RedisFailover
 
       @zk.register(@manual_znode) do |event|
         @mutex.synchronize do
-          if event.node_changed?
-            schedule_manual_failover
+          begin
+            if event.node_created? || event.node_changed?
+              schedule_manual_failover
+            end
+          rescue => ex
+            logger.error("Error scheduling a manual failover: #{ex.inspect}")
+            logger.error(ex.backtrace.join("\n"))
+          ensure
+            @zk.stat(@manual_znode, :watch => true)
           end
         end
       end
@@ -340,15 +347,22 @@ module RedisFailover
     def schedule_manual_failover
       return unless @leader
       new_master = @zk.get(@manual_znode, :watch => true).first
+      return unless new_master && new_master.size > 0
       logger.info("Received manual failover request for: #{new_master}")
+      logger.info("Current nodes: #{current_nodes.inspect}")
 
       node = if new_master == ManualFailover::ANY_SLAVE
-        @slaves.sample
+        @slaves.shuffle.first
       else
         host, port = new_master.split(':', 2)
         Node.new(:host => host, :port => port, :password => @options[:password])
       end
-      notify_state(node, :manual_failover) if node
+
+      if node
+        notify_state(node, :manual_failover)
+      else
+        logger.error('Failed to perform manual failover, no candidate found.')
+      end
     end
   end
 end

data/lib/redis_failover/version.rb

@@ -1,3 +1,3 @@
 module RedisFailover
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_failover
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -189,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 827412647750283458
+      hash: -610590228690809533
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 827412647750283458
+      hash: -610590228690809533
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23