redis_failover 0.5.0 → 0.5.1

data/Changes.md

@@ -1,3 +1,9 @@
+0.5.1
+-----------
+- More logging around exceptions
+- Handle re-watching on client session expirations / disconnections
+- Use an ephemeral node for the list of redis servers
+
 0.5.0
 -----------
 - redis_failover is now built on top of ZooKeeper! This means redis_failover enjoys all of the reliability, redundancy, and data consistency offered by ZooKeeper. The old fragile HTTP-based approach has been removed and will no longer be supported in favor of ZooKeeper. This does mean that in order to use redis_failover, you must have ZooKeeper installed and running. Please see the README for steps on how to do this if you don't already have ZooKeeper running in your production environment.

data/lib/redis_failover/client.rb

@@ -110,20 +110,27 @@ module RedisFailover
     def setup_zookeeper_client
       @zkclient = ZkClient.new(@zkservers)
 
-      # when session expires / we are disconnected, purge client list
+      # when session expires, purge client list
       @zkclient.on_session_expiration do
         @lock.synchronize { purge_clients }
       end
+
+      # when we are disconnected, purge client list
       @zkclient.event_handler.register_state_handler(:connecting) do
         @lock.synchronize { purge_clients }
       end
 
+      # when session is recovered, watch again
+      @zkclient.on_session_recovered do
+        @zkclient.stat(@znode, :watch => true)
+      end
+
       # register a watcher for future changes
       @zkclient.watcher.register(@znode) do |event|
         if event.node_created? || event.node_changed?
           build_clients
         elsif event.node_deleted?
-          @zkclient.stat( @znode, :watch => true)
+          @zkclient.stat(@znode, :watch => true)
           @lock.synchronize { purge_clients }
         else
           logger.error("Unknown ZK node event: #{event.inspect}")
@@ -149,6 +156,8 @@ module RedisFailover
         end
       rescue *ALL_ERRORS => ex
         logger.error("Error while handling operation `#{method}` - #{ex.message}")
+        logger.error(ex.backtrace.join("\n"))
+
         if tries < @max_retries
           tries += 1
           build_clients

data/lib/redis_failover/node_manager.rb

@@ -187,18 +187,17 @@ module RedisFailover
     end
 
     def delete_path
-      if @zkclient.stat(@znode).exists?
-        @zkclient.delete(@znode)
-        logger.info("Deleted zookeeper node #{@znode}")
-      end
+      @zkclient.delete(@znode)
+      logger.info("Deleted zookeeper node #{@znode}")
+    rescue ZK::Exceptions::NoNode => ex
+      logger.info("Tried to delete missing znode: #{ex.message}")
     end
 
     def create_path
-      # create nodes path if it doesn't already exist in ZK
-      unless @zkclient.stat(@znode).exists?
-        @zkclient.create(@znode, encode(current_nodes))
-        logger.info("Created zookeeper node #{@znode}")
-      end
+      @zkclient.create(@znode, encode(current_nodes), :ephemeral => true)
+      logger.info("Created zookeeper node #{@znode}")
+    rescue ZK::Exceptions::NodeExists
+      # best effort
     end
 
     def initialize_path

data/lib/redis_failover/version.rb

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

data/lib/redis_failover/zk_client.rb

@@ -17,6 +17,11 @@ module RedisFailover
       @on_session_expiration = block
     end
 
+    def on_session_recovered(&block)
+      @client.on_connected { block.call }
+      @on_session_recovered = block
+    end
+
     def get(*args, &block)
       perform_with_reconnect { @client.get(*args, &block) }
     end
@@ -55,8 +60,9 @@ module RedisFailover
         logger.info("Zookeeper client session expired, rebuilding client.")
         if tries < MAX_RECONNECTS
           tries += 1
-          build_client
           @on_session_expiration.call if @on_session_expiration
+          build_client
+          @on_session_recovered.call if @on_session_recovered
           sleep(2) && retry
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_failover
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   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: &70300698370600 !ruby/object:Gem::Requirement
+  requirement: &70319722640420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300698370600
+  version_requirements: *70319722640420
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70300698370180 !ruby/object:Gem::Requirement
+  requirement: &70319722640000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300698370180
+  version_requirements: *70319722640000
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70300698369740 !ruby/object:Gem::Requirement
+  requirement: &70319722639560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300698369740
+  version_requirements: *70319722639560
 - !ruby/object:Gem::Dependency
   name: zk
-  requirement: &70300698369320 !ruby/object:Gem::Requirement
+  requirement: &70319722639140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300698369320
+  version_requirements: *70319722639140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70300698368900 !ruby/object:Gem::Requirement
+  requirement: &70319722638720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300698368900
+  version_requirements: *70319722638720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70300698368480 !ruby/object:Gem::Requirement
+  requirement: &70319722638300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300698368480
+  version_requirements: *70319722638300
 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: -1870245960706248512
+      hash: 2520193948527829563
 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: -1870245960706248512
+      hash: 2520193948527829563
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16