redis-sentinel 1.4.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85e2d012825c2c5f740cd1f33ea4f1f6ac5e8c4a
-  data.tar.gz: 3d21614c18f64cf3e2912521f5390a1eee03fb01
+  metadata.gz: 822e055ecb4e148a1bf08b701e21f6712c519373
+  data.tar.gz: de6b225b065c14d3e429f19a94aa786aa728c9f2
 SHA512:
-  metadata.gz: b5a62c1d6196a9ae88ee0609af812c98345087ec287f0860f9c5f7da61d5cb420ac7d61849257048e49c2c540cfcd17d75440f6d786e29f121cbe83536747167
-  data.tar.gz: b2186c8627bea8d15615401648b78f15180ffbadf3fa4e25731bc6c54c263cd658b4685c4da3349583f3f7e19a8f80605b409782d0848fdea22c18b11cafd1f7
+  metadata.gz: 0b6a20ab1e214763b79a47aa0122ea054e45ee9527512a1a56ffc27f6caea384c495d153fe229cb184459e8482805eef7d3377387a83ed377c0d0710952ecda2
+  data.tar.gz: 00e40455360c4969dca6f38cfe2aa9707ead89f04e4a0eff35565ac3977c471979acc23f22ff18524337867d942734ab37dc3c0a44a3fff3b3012c017f8350f7

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 1.5.0
+
+* Subscribe +switch-master again
+* Prevents master discovery to get stuck in endless loop if sentinels
+  are not available
+* Always reconnect at least once, even if reconnect timeout is 0
+* Catch networking errors which bubble up past redis
+
 ## 1.4.4
 
 * Allow client to return list of slaves

data/README.md

@@ -37,6 +37,11 @@ Sentinels can also be specified using a URI. This URI syntax is required when us
     config.cache_store = :redis_store, { master_name: "master1",
                                          sentinels: ['sentinel://localhost:26379', 'sentinel://localhost:26380'] }
 
+After doing the above, you might still see `#<Redis client v3.1.0 for redis://localhost:6379/0>`. 
+This is fine because redis-sentinel will only try to connect when it is actually required. 
+
+However, if none of the sentinel servers can be reached, a Redis::CannotConnectError will be thrown.
+
 There are two additional options:
 
 1. `:failover_reconnect_timeout` (seconds) will block for that long when

data/Rakefile

@@ -8,7 +8,7 @@ require "rspec/core/rake_task"
 
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = "spec/**/*_spec.rb"
+  spec.pattern = "spec/redis-sentinel/client_spec.rb"
 end
 
 RSpec::Core::RakeTask.new('spec:progress') do |spec|

data/example/redis-master.conf

@@ -50,7 +50,7 @@ loglevel notice
 # Specify the log file name. Also 'stdout' can be used to force
 # Redis to log on the standard output. Note that if you use standard
 # output for logging but daemonize, logs will be sent to /dev/null
-logfile stdout
+logfile ""
 
 # To enable logging to the system logger, just set 'syslog-enabled' to yes,
 # and optionally update the other syslog parameters to suit your needs.

data/example/redis-slave.conf

@@ -50,7 +50,7 @@ loglevel notice
 # Specify the log file name. Also 'stdout' can be used to force
 # Redis to log on the standard output. Note that if you use standard
 # output for logging but daemonize, logs will be sent to /dev/null
-logfile stdout
+logfile ""
 
 # To enable logging to the system logger, just set 'syslog-enabled' to yes,
 # and optionally update the other syslog parameters to suit your needs.

data/lib/redis-sentinel/client.rb

@@ -15,6 +15,8 @@ class Redis::Client
       @failover_reconnect_wait = fetch_option(options, :failover_reconnect_wait) ||
                                  DEFAULT_FAILOVER_RECONNECT_WAIT_SECONDS
 
+      Thread.new { watch_sentinel } if sentinel? && !fetch_option(options, :async)
+
       initialize_without_sentinel(options)
     end
 
@@ -43,7 +45,7 @@ class Redis::Client
       deadline = @failover_reconnect_timeout.to_i + Time.now.to_f
       begin
         block.call
-      rescue Redis::CannotConnectError
+      rescue Redis::CannotConnectError, Errno::EHOSTDOWN, Errno::EHOSTUNREACH
         raise if Time.now.to_f > deadline
         sleep @failover_reconnect_wait
         retry
@@ -66,7 +68,9 @@ class Redis::Client
     end
 
     def discover_master
+      attempts = 0
       while true
+        attempts += 1
         try_next_sentinel
 
         begin
@@ -81,8 +85,9 @@ class Redis::Client
           end
         rescue Redis::CommandError => e
           raise unless e.message.include?("IDONTKNOW")
-        rescue Redis::CannotConnectError
+        rescue Redis::CannotConnectError, Errno::EHOSTDOWN, Errno::EHOSTUNREACH => e
           # failed to connect to current sentinel server
+          raise e if attempts > @sentinels_options.count
         end
       end
     end
@@ -95,13 +100,13 @@ class Redis::Client
           slaves_info = current_sentinel.sentinel("slaves", @master_name)
           @slaves = slaves_info.map do |info|
             info = Hash[*info]
-            ::Redis.new :host => info['ip'], :port => info['port'], :driver => info[:driver]
+            ::Redis.new(@options.merge(:host => info['ip'], :port => info['port'], :driver => info[:driver]))
           end
 
           break
         rescue Redis::CommandError => e
           raise unless e.message.include?("IDONTKNOW")
-        rescue Redis::CannotConnectError
+        rescue Redis::CannotConnectError, Errno::EHOSTDOWN, Errno::EHOSTUNREACH
           # failed to connect to current sentinel server
         end
       end
@@ -139,15 +144,42 @@ class Redis::Client
     alias call_pipeline_without_readonly_protection call_pipeline
     alias call_pipeline call_pipeline_with_readonly_protection
 
+    def watch_sentinel
+      while true
+        sentinel = Redis.new(@sentinels_options[0])
+
+        begin
+          sentinel.psubscribe("*") do |on|
+            on.pmessage do |pattern, channel, message|
+              next if channel != "+switch-master"
+
+              master_name, old_host, old_port, new_host, new_port = message.split(" ")
+
+              next if master_name != @master_name
+
+              @options.merge!(host: new_host, port: new_port.to_i)
+
+              @logger.debug "Failover: #{old_host}:#{old_port} => #{new_host}:#{new_port}" if @logger && @logger.debug?
+
+              disconnect
+            end
+          end
+        rescue Redis::CannotConnectError, Errno::EHOSTDOWN, Errno::EHOSTUNREACH
+          try_next_sentinel
+          sleep 1
+        end
+      end
+    end
+
   private
     def readonly_protection_with_timeout(method, *args, &block)
       deadline = @failover_reconnect_timeout.to_i + Time.now.to_f
       send(method, *args, &block)
     rescue Redis::CommandError => e
       if e.message.include? "READONLY You can't write against a read only slave."
+        reconnect
         raise if Time.now.to_f > deadline
         sleep @failover_reconnect_wait
-        reconnect
         retry
       else
         raise

data/lib/redis-sentinel/version.rb

@@ -1,5 +1,5 @@
 class Redis
   module Sentinel
-    VERSION = "1.4.4"
+    VERSION = "1.5.0"
   end
 end

data/spec/redis-sentinel/client_spec.rb

@@ -25,7 +25,7 @@ describe Redis::Client do
 
   context "new instances" do
     it "should parse sentinel options" do
-      expect(subject.instance_variable_get(:@sentinels_options)).to eq [
+      expect(subject.instance_variable_get(:@sentinels_options)).to match_array [
         {:host=>"localhost", :port=>26379},
         {:host=>"localhost", :port=>26380},
         {:host=>"localhost", :port=>26381}

data/spec/redis-sentinel/em_client_spec.rb

@@ -5,7 +5,8 @@ require "eventmachine"
 describe Redis::Client do
   context "#auto_retry_with_timeout" do
     subject { described_class.new(:failover_reconnect_timeout => 3,
-                                :failover_reconnect_wait => 0.1) }
+                                  :failover_reconnect_wait => 0.1,
+                                  :async => true) }
     context "configured wait time" do
 
       it "uses the wait time and blocks em" do

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: redis-sentinel
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: another redis automatic master/slave failover solution for ruby by using
@@ -102,9 +102,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -137,17 +135,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: another redis automatic master/slave failover solution for ruby by using

data/.ruby-gemset

@@ -1 +0,0 @@
-redis-sentinel

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.0.0