redis_failover 0.9.5 → 0.9.6

data/Changes.md

@@ -1,3 +1,7 @@
+0.9.6
+-----------
+- Handle the node discovery error condition where the znode points to a master that is now a slave.
+
 0.9.5
 -----------
 - Introduce a safer master node discovery process for the Node Manager (#34)

data/lib/redis_failover/node_manager.rb

@@ -11,6 +11,7 @@ module RedisFailover
 
     # Number of seconds to wait before retrying bootstrap process.
     TIMEOUT = 3
+
     # ZK Errors that the Node Manager cares about.
     ZK_ERRORS = [
       ZK::Exceptions::LockAssertionFailedError,
@@ -18,6 +19,14 @@ module RedisFailover
       ZKDisconnectedError
     ].freeze
 
+    # Errors that can happen during the node discovery process.
+    NODE_DISCOVERY_ERRORS = [
+      InvalidNodeRoleError,
+      NodeUnavailableError,
+      NoMasterError,
+      MultipleMastersError
+    ].freeze
+
     # Creates a new instance.
     #
     # @param [Hash] options the options used to initialize the manager
@@ -248,7 +257,7 @@ module RedisFailover
         redirect_slaves_to(@master)
         true
       end
-    rescue NodeUnavailableError, NoMasterError, MultipleMastersError => ex
+    rescue *NODE_DISCOVERY_ERRORS => ex
       msg = <<-MSG.gsub(/\s+/, ' ')
         Failed to discover master node: #{ex.inspect}
         In order to ensure a safe startup, redis_failover requires that all redis
@@ -268,6 +277,12 @@ module RedisFailover
         nodes = symbolize_keys(decode(data))
         master = node_from(nodes[:master])
         logger.info("Master from existing znode config: #{master || 'none'}")
+        # Check for case where a node previously thought to be the master was
+        # somehow manually reconfigured to be a slave outside of the node manager's
+        # control.
+        if master && master.slave?
+          raise InvalidNodeRoleError.new(master, :master, :slave)
+        end
         master
       end
     rescue ZK::Exceptions::NoNode

data/lib/redis_failover/version.rb

@@ -1,3 +1,3 @@
 module RedisFailover
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_failover
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
   prerelease: 
 platform: ruby
 authors:
@@ -189,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2193925210006995870
+      hash: -1728937543756206393
 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: -2193925210006995870
+      hash: -1728937543756206393
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23