redis_failover 1.0.0 → 1.0.1

data/Changes.md

@@ -1,3 +1,8 @@
+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)
+- Fix an issue where a failover would not occur if we couldn't check the role of a downed master
+
 1.0.0
 -----------
 ** NOTE: This version of redis_failover requires that you upgrade your clients and Node Managers at the same time.

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/ryanlecompte/redis_failover.png?branch=master)](http://travis-ci.org/ryanlecompte/redis_failover)
 
-redis_failover attempts to provides a full automatic master/slave failover solution for Ruby. Redis does not currently provide
+redis_failover provides a full automatic master/slave failover solution for Ruby. Redis does not currently provide
 an automatic failover capability when configured for master/slave replication. When the master node dies,
 a new master must be manually brought online and assigned as the slave's new master. This manual
 switch-over is not desirable in high traffic sites where Redis is a critical part of the overall

data/lib/redis_failover.rb

@@ -17,9 +17,9 @@ require 'redis_failover/errors'
 require 'redis_failover/client'
 require 'redis_failover/runner'
 require 'redis_failover/version'
-require 'redis_failover/node_strategy'
 require 'redis_failover/node_manager'
 require 'redis_failover/node_watcher'
+require 'redis_failover/node_strategy'
 require 'redis_failover/node_snapshot'
 require 'redis_failover/manual_failover'
 require 'redis_failover/failover_strategy'

data/lib/redis_failover/node_manager.rb

@@ -259,9 +259,14 @@ module RedisFailover
         # 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)
+        begin
+          if master && master.slave?
+            raise InvalidNodeRoleError.new(master, :master, :slave)
+          end
+        rescue RedisFailover::NodeUnavailableError => ex
+          logger.warn("Failed to check whether existing master has invalid role: #{ex.inspect}")
         end
+
         master
       end
     rescue ZK::Exceptions::NoNode

data/lib/redis_failover/version.rb

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

data/redis_failover.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency('redis', ['>= 2.2', '< 4'])
   gem.add_dependency('redis-namespace')
   gem.add_dependency('multi_json', '~> 1')
-  gem.add_dependency('zk', ['>= 1.7.2', '< 1.8'])
+  gem.add_dependency('zk', ['>= 1.7.4', '< 1.8'])
 
   gem.add_development_dependency('rake')
   gem.add_development_dependency('rspec')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_failover
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -72,7 +72,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.7.4
     - - <
       - !ruby/object:Gem::Version
         version: '1.8'
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.7.4
     - - <
       - !ruby/object:Gem::Version
         version: '1.8'
@@ -209,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 87105057959996156
+      hash: -1642431998489370945
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 87105057959996156
+      hash: -1642431998489370945
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23