nogara-redis_failover 0.9.7 → 0.9.7.2

data/spec/node_watcher_spec.rb

@@ -6,7 +6,7 @@ module RedisFailover
       @node_states = {}
     end
 
-    def notify_state(node, state)
+    def notify_state(node, state, latency = nil)
       @node_states[node] = state
     end
 
@@ -50,7 +50,7 @@ module RedisFailover
           watcher.watch
           sleep(3)
           watcher.shutdown
-          node_manager.state_for(node).should == :syncing
+          node_manager.state_for(node).should == :available
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rspec'
+require 'ostruct'
 require 'redis_failover'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
@@ -17,4 +18,4 @@ end
 def ZK.new(*args); NullObject.new; end
 
 RSpec.configure do |config|
-end
+end

data/spec/support/node_manager_stub.rb

@@ -13,9 +13,11 @@ module RedisFailover
       [master, slave].each { |node| node.extend(RedisStubSupport) }
       master.make_master!
       slave.make_slave!(master)
+      @nodes = [master, slave]
       @unavailable = []
       @master = master
       @slaves = [slave]
+      @failover_strategy = Object.new
       @nodes_discovered = true
     end
 
@@ -33,34 +35,53 @@ module RedisFailover
     end
 
     def stop_processing
-      @queue << nil
       @thread.value
     end
 
     def force_unavailable(node)
       start_processing
       node.redis.make_unavailable!
-      notify_state(node, :unavailable)
+      snapshot = OpenStruct.new(
+        :node => node,
+        :available_count => 0,
+        :unavailable_count => 1,
+        :node_managers => ['nm'])
+      update_master_state(node, node => snapshot)
       stop_processing
     end
 
     def force_available(node)
       start_processing
       node.redis.make_available!
-      notify_state(node, :available)
+      snapshot = OpenStruct.new(
+        :node => node,
+        :available_count => 1,
+        :unavailable_count => 0,
+        :node_managers => ['nm'])
+      update_master_state(node, node => snapshot)
       stop_processing
     end
 
     def force_syncing(node, serve_stale_reads)
       start_processing
       node.redis.force_sync_with_master(serve_stale_reads)
-      notify_state(node, :syncing)
+      snapshot = OpenStruct.new(
+        :node => node,
+        :available_count => 1,
+        :unavailable_count => 0,
+        :node_managers => ['nm'])
+      update_master_state(node, node => snapshot)
       stop_processing
     end
 
-    def initialize_path; end
-    def delete_path; end
-    def create_path; end
-    def write_state; end
+    def failover_strategy_candidate(snapshots)
+      @slaves.pop
+    end
+
+    def delete_path(*args); end
+    def create_path(*args); end
+    def write_state(*args); end
+    def wait_until_master; end
+    def current_node_snapshots; {} end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nogara-redis_failover
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -70,17 +70,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -153,9 +159,16 @@ files:
 - lib/redis_failover/cli.rb
 - lib/redis_failover/client.rb
 - lib/redis_failover/errors.rb
+- lib/redis_failover/failover_strategy.rb
+- lib/redis_failover/failover_strategy/latency.rb
 - lib/redis_failover/manual_failover.rb
 - lib/redis_failover/node.rb
 - lib/redis_failover/node_manager.rb
+- lib/redis_failover/node_snapshot.rb
+- lib/redis_failover/node_strategy.rb
+- lib/redis_failover/node_strategy/consensus.rb
+- lib/redis_failover/node_strategy/majority.rb
+- lib/redis_failover/node_strategy/single.rb
 - lib/redis_failover/node_watcher.rb
 - lib/redis_failover/runner.rb
 - lib/redis_failover/util.rb
@@ -164,8 +177,15 @@ files:
 - redis_failover.gemspec
 - spec/cli_spec.rb
 - spec/client_spec.rb
+- spec/failover_strategy/latency_spec.rb
+- spec/failover_strategy_spec.rb
 - spec/node_manager_spec.rb
+- spec/node_snapshot_spec.rb
 - spec/node_spec.rb
+- spec/node_strategy/consensus_spec.rb
+- spec/node_strategy/majority_spec.rb
+- spec/node_strategy/single_spec.rb
+- spec/node_strategy_spec.rb
 - spec/node_watcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/config/multiple_environments.yml
@@ -203,8 +223,15 @@ summary: redis_failover is a ZooKeeper-based automatic master/slave failover sol
 test_files:
 - spec/cli_spec.rb
 - spec/client_spec.rb
+- spec/failover_strategy/latency_spec.rb
+- spec/failover_strategy_spec.rb
 - spec/node_manager_spec.rb
+- spec/node_snapshot_spec.rb
 - spec/node_spec.rb
+- spec/node_strategy/consensus_spec.rb
+- spec/node_strategy/majority_spec.rb
+- spec/node_strategy/single_spec.rb
+- spec/node_strategy_spec.rb
 - spec/node_watcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/config/multiple_environments.yml