redis_failover 1.0.1 → 1.0.2

data/Changes.md

@@ -1,3 +1,8 @@
+1.0.2
+-----------
+- Reopen client if an ZK::Exceptions::InterruptedSession occurs (#50, mauricio)
+- Insert the "root_znode" path before "master_redis_node_manager_lock" and expose via accessor (#52, jzaleski)
+
 1.0.1
 -----------
 - Bumped required dependency on ZK gem. ZK 1.7.4 fixes a critical bug with locking (see https://github.com/slyphon/zk/issues/54)

data/lib/redis_failover/client.rb

@@ -317,7 +317,7 @@ module RedisFailover
       logger.debug("Fetched nodes: #{nodes.inspect}")
 
       nodes
-    rescue Zookeeper::Exceptions::InheritedConnectionError => ex
+    rescue Zookeeper::Exceptions::InheritedConnectionError, ZK::Exceptions::InterruptedSession => ex
       logger.debug { "Caught #{ex.class} '#{ex.message}' - reopening ZK client" }
       @zk.reopen
       retry

data/lib/redis_failover/node_manager.rb

@@ -459,6 +459,11 @@ module RedisFailover
       "#{@root_znode}/nodes"
     end
 
+    # @return [String] root path for current node manager lock
+    def current_lock_path
+      "#{@root_znode}/master_redis_node_manager_lock"
+    end
+
     # @return [String] the znode path used for performing manual failovers
     def manual_failover_path
       ManualFailover.path(@root_znode)
@@ -631,7 +636,7 @@ module RedisFailover
 
     # Executes a block wrapped in a ZK exclusive lock.
     def with_lock
-      @zk_lock ||= @zk.locker('master_redis_node_manager_lock')
+      @zk_lock ||= @zk.locker(current_lock_path)
 
       begin
         @zk_lock.lock!(true)

data/lib/redis_failover/version.rb

@@ -1,3 +1,3 @@
 module RedisFailover
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_failover
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -209,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1642431998489370945
+      hash: 991009766227287450
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -218,10 +218,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1642431998489370945
+      hash: 991009766227287450
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: redis_failover is a ZooKeeper-based automatic master/slave failover solution