nogara-redis_failover 0.9.7.4 → 1.0.0

data/Changes.md

@@ -1,5 +1,7 @@
-HEAD
+1.0.0
 -----------
+** NOTE: This version of redis_failover requires that you upgrade your clients and Node Managers at the same time.
+
 - redis_failover now supports distributed monitoring among the Node Managers! Previously, the Node Managers were only used
 as a means of redundancy in case a particular node manager crashed. Starting with version 1.0 of redis_failover, the Node
 Managers will all periodically report their health report/snapshots. The primary Node Manager will utilize a configurable
@@ -8,6 +10,7 @@ Managers will all periodically report their health report/snapshots. The primary
 a single strategy is provided that takes into account the average latency of the last health check to the redis server.
 - Improved handling of underlying ZK client connection in RedisFailover::NodeManager
 - Add support for passing in an existing ZK client instance to RedisFailover::Cient.new
+- Reduce unnecessary writes to ZK
 
 0.9.7.2
 -----------

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/client.rb

@@ -321,6 +321,10 @@ module RedisFailover
       logger.debug { "Caught #{ex.class} '#{ex.message}' - reopening ZK client" }
       @zk.reopen
       retry
+    rescue *ZK_ERRORS => ex
+      logger.warn { "Caught #{ex.class} '#{ex.message}' - retrying" }
+      sleep(RETRY_WAIT_TIME)
+      retry
     end
 
     # Builds new Redis clients for the specified nodes.

data/lib/redis_failover/node_manager.rb

@@ -12,15 +12,11 @@ module RedisFailover
     # Number of seconds to wait before retrying bootstrap process.
     TIMEOUT = 5
     # Number of seconds for checking node snapshots.
-    CHECK_INTERVAL = 10
+    CHECK_INTERVAL = 5
     # Number of max attempts to promote a master before releasing master lock.
     MAX_PROMOTION_ATTEMPTS = 3
-
-    # ZK Errors that the Node Manager cares about.
-    ZK_ERRORS = [
-      ZK::Exceptions::LockAssertionFailedError,
-      ZK::Exceptions::InterruptedSession
-    ].freeze
+    # Latency threshold for recording node state.
+    LATENCY_THRESHOLD = 0.5
 
     # Errors that can happen during the node discovery process.
     NODE_DISCOVERY_ERRORS = [
@@ -436,6 +432,12 @@ module RedisFailover
       write_state(redis_nodes_path, encode(current_nodes))
     end
 
+    # Writes the current monitored list of redis nodes. This method is always
+    # invoked by all running node managers.
+    def write_current_monitored_state
+      write_state(current_state_path, encode(node_availability_state), :ephemeral => true)
+    end
+
     # @return [String] root path for current node manager state
     def current_state_root
       "#{@root_znode}/manager_node_state"
@@ -496,21 +498,31 @@ module RedisFailover
     # @param [Symbol] state the node state
     # @param [Integer] latency an optional latency
     def update_current_state(node, state, latency = nil)
+      old_unavailable = @monitored_unavailable.dup
+      old_available = @monitored_available.dup
+
       case state
       when :unavailable
-        @monitored_unavailable |= [node]
-        @monitored_available.delete(node)
+        unless @monitored_unavailable.include?(node)
+          @monitored_unavailable << node
+          @monitored_available.delete(node)
+          write_current_monitored_state
+        end
       when :available
-        @monitored_available[node] = latency
-        @monitored_unavailable.delete(node)
+        last_latency = @monitored_available[node]
+        if last_latency.nil? || (latency - last_latency) > LATENCY_THRESHOLD
+          @monitored_available[node] = latency
+          @monitored_unavailable.delete(node)
+          write_current_monitored_state
+        end
       else
         raise InvalidNodeStateError.new(node, state)
       end
-
-      # flush ephemeral current node manager state
-      write_state(current_state_path,
-        encode(node_availability_state),
-        :ephemeral => true)
+    rescue => ex
+      # if an error occurs, make sure that we rollback to the old state
+      @monitored_unavailable = old_unavailable
+      @monitored_available = old_available
+      raise
     end
 
     # Fetches each currently running node manager's view of the

data/lib/redis_failover/util.rb

@@ -61,11 +61,19 @@ module RedisFailover
     REDIS_ERRORS << Redis::BaseError if Redis.const_defined?('BaseError')
     REDIS_ERRORS.freeze
 
+    # ZK Errors
+    ZK_ERRORS = [
+      ZK::Exceptions::LockAssertionFailedError,
+      ZK::Exceptions::InterruptedSession,
+      ZK::Exceptions::Retryable,
+      Zookeeper::Exceptions::ContinuationTimeoutError
+    ].freeze
+
     # Full set of errors related to connectivity.
     CONNECTIVITY_ERRORS = [
       RedisFailover::Error,
-      ZK::Exceptions::InterruptedSession,
-      REDIS_ERRORS
+      REDIS_ERRORS,
+      ZK_ERRORS
     ].flatten.freeze
 
     # Symbolizes the keys of the specified hash.

data/lib/redis_failover/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nogara-redis_failover
 version: !ruby/object:Gem::Version
-  version: 0.9.7.4
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis