redis_failover 0.5.1 → 0.5.2

data/Changes.md

@@ -1,3 +1,8 @@
+0.5.2
+-----------
+- Always try to create path before setting current state in Node Manager.
+- More explicit rescuing of exceptions.
+
 0.5.1
 -----------
 - More logging around exceptions

data/README.md

@@ -96,7 +96,7 @@ The full set of options that can be passed to RedisFailover::Client are:
 ## Requirements
 
 - redis_failover is actively tested against MRI 1.9.2/1.9.3. Other rubies may work, although I don't actively test against them. 1.8 is not supported.
-- redis_failover requires a ZooKeeper service cluster to ensure reliability and data consistency. ZooKeeper is very simple and easy to get up and running. Please refer to this [Zookeper Guide](http://zookeeper.apache.org/doc/trunk/zookeeperStarted.html) to get up and running quickly if you don't already have ZooKeeper as a part of your environment.
+- redis_failover requires a ZooKeeper service cluster to ensure reliability and data consistency. ZooKeeper is very simple and easy to get up and running. Please refer to this [Quick ZooKeeper Guide](https://github.com/ryanlecompte/redis_failover/wiki/Quick-ZooKeeper-Guide) to get up and running quickly if you don't already have ZooKeeper as a part of your environment.
 
 ## Considerations
 
@@ -107,11 +107,13 @@ The full set of options that can be passed to RedisFailover::Client are:
 ## TODO
 
 - Rework specs to work against a set of real Redis/ZooKeeper nodes as opposed to stubs.
+- Add support for running more than one Node Manager.
 
 ## Resources
 
 - To learn more about Redis master/slave replication, see the [Redis documentation](http://redis.io/topics/replication).
 - 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.
 
 ## License
 

data/lib/redis_failover/client.rb

@@ -71,7 +71,7 @@ module RedisFailover
     #   :namespace - namespace for redis nodes (optional)
     #   :logger - logger override (optional)
     #   :retry_failure - indicate if failures should be retried (default true)
-    #   :max_retries - max retries for a failure (default 5)
+    #   :max_retries - max retries for a failure (default 3)
     #
     def initialize(options = {})
       Util.logger = options[:logger] if options[:logger]
@@ -80,10 +80,10 @@ module RedisFailover
       @namespace = options[:namespace]
       @password = options[:password]
       @retry = options[:retry_failure] || true
-      @max_retries = @retry ? options.fetch(:max_retries, 3) : 0
+      @max_retries = @retry ? options.fetch(:max_retries, 3) : 1
       @master = nil
       @slaves = []
-      @lock = Mutex.new
+      @lock = Monitor.new
       setup_zookeeper_client
       build_clients
     end
@@ -112,12 +112,12 @@ module RedisFailover
 
       # when session expires, purge client list
       @zkclient.on_session_expiration do
-        @lock.synchronize { purge_clients }
+        purge_clients
       end
 
       # when we are disconnected, purge client list
       @zkclient.event_handler.register_state_handler(:connecting) do
-        @lock.synchronize { purge_clients }
+        purge_clients
       end
 
       # when session is recovered, watch again
@@ -131,7 +131,7 @@ module RedisFailover
           build_clients
         elsif event.node_deleted?
           @zkclient.stat(@znode, :watch => true)
-          @lock.synchronize { purge_clients }
+          purge_clients
         else
           logger.error("Unknown ZK node event: #{event.inspect}")
         end
@@ -154,7 +154,7 @@ module RedisFailover
           # direct everything else to master
           master.send(method, *args, &block)
         end
-      rescue *ALL_ERRORS => ex
+      rescue *CONNECTIVITY_ERRORS => ex
         logger.error("Error while handling operation `#{method}` - #{ex.message}")
         logger.error(ex.backtrace.join("\n"))
 
@@ -200,7 +200,7 @@ module RedisFailover
           new_slaves = new_clients_for(*nodes[:slaves])
           @master = new_master
           @slaves = new_slaves
-        rescue *ALL_ERRORS => ex
+        rescue StandardError, *CONNECTIVITY_ERRORS => ex
           purge_clients
           logger.error("Failed to fetch nodes from #{@zkservers} - #{ex.message}")
           logger.error(ex.backtrace.join("\n"))
@@ -285,10 +285,12 @@ module RedisFailover
     end
 
     def purge_clients
-      logger.info("Purging current redis clients")
-      disconnect(@master, *@slaves)
-      @master = nil
-      @slaves = []
+      @lock.synchronize do
+        logger.info("Purging current redis clients")
+        disconnect(@master, *@slaves)
+        @master = nil
+        @slaves = []
+      end
     end
   end
 end

data/lib/redis_failover/node_manager.rb

@@ -41,7 +41,7 @@ module RedisFailover
 
           # flush current state
           write_state
-        rescue *ALL_ERRORS => ex
+        rescue StandardError, *CONNECTIVITY_ERRORS => ex
           logger.error("Error while handling #{state_change.inspect}: #{ex.message}")
           logger.error(ex.backtrace.join("\n"))
         end
@@ -206,6 +206,7 @@ module RedisFailover
     end
 
     def write_state
+      create_path
       @zkclient.set(@znode, encode(current_nodes))
     end
   end

data/lib/redis_failover/util.rb

@@ -5,13 +5,13 @@ module RedisFailover
   module Util
     extend self
 
-    DEFAULT_ZNODE_PATH = '/redis_failover_nodes'
-    REDIS_ERRORS = Errno.constants.map { |c| Errno.const_get(c) }
-    ALL_ERRORS = [
+    DEFAULT_ZNODE_PATH = '/redis_failover_nodes'.freeze
+    REDIS_ERRORS = Errno.constants.map { |c| Errno.const_get(c) }.freeze
+    CONNECTIVITY_ERRORS = [
       RedisFailover::Error,
+      ZK::Exceptions::KeeperException,
       ZookeeperExceptions::ZookeeperException,
-      REDIS_ERRORS,
-      StandardError].flatten
+      REDIS_ERRORS].flatten.freeze
 
     def symbolize_keys(hash)
       Hash[hash.map { |k, v| [k.to_sym, v] }]

data/lib/redis_failover/version.rb

@@ -1,3 +1,3 @@
 module RedisFailover
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_failover
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70319722640420 !ruby/object:Gem::Requirement
+  requirement: &70127944589860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70319722640420
+  version_requirements: *70127944589860
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70319722640000 !ruby/object:Gem::Requirement
+  requirement: &70127944589440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70319722640000
+  version_requirements: *70127944589440
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70319722639560 !ruby/object:Gem::Requirement
+  requirement: &70127944589000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70319722639560
+  version_requirements: *70127944589000
 - !ruby/object:Gem::Dependency
   name: zk
-  requirement: &70319722639140 !ruby/object:Gem::Requirement
+  requirement: &70127944588580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70319722639140
+  version_requirements: *70127944588580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70319722638720 !ruby/object:Gem::Requirement
+  requirement: &70127944588160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70319722638720
+  version_requirements: *70127944588160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70319722638300 !ruby/object:Gem::Requirement
+  requirement: &70127944587740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70319722638300
+  version_requirements: *70127944587740
 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: 2520193948527829563
+      hash: -3828155279649118741
 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: 2520193948527829563
+      hash: -3828155279649118741
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16