redis-sentinel 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20c20d9586d8c9751e1ec9e9dff72133a6c07854
-  data.tar.gz: 9d5e482d914cc224b46061a846468c285368b85a
+  metadata.gz: a79a501844ac25c4bdde61c4801a75e65d22bd0d
+  data.tar.gz: f40c099446f5b31cc8558aaacb06f8e325381d5f
 SHA512:
-  metadata.gz: e0f05568866ee3a20d2ed22784fd93488e7ad00a9f41064973eee7e561a98463cc5f802466bb1f2e568a7caf9b22556c0a2ecbb34c29ecda406a59c8e4354eb0
-  data.tar.gz: 0a0e3dd641a640f9819f1aa84ca63a45e6c9aca77e874c21abc6f0a1cc182456bd5c4ad504561306d31f8ad1797e73ab0fded4445356d61347ae7e8b46006805
+  metadata.gz: 83f3892eacb138abf90d169bb452dc59ff46d91cc25f2581c1278cbf48e026ccc16006db28d92b7041d8c8ce2d2331876619567e1287e713eb3910c27ec70596
+  data.tar.gz: 90c948ebe4d6bfa1a8a105d79d6e9569cd88cc63988f02c961c11a03f2c3450b63a02de33f6d38bfc1fef71e3b38ce14860f9219dc041bc6424a9a93d316d77e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.4.2
+
+* Fix sentinel reconnection broken
+
 ## 1.4.1
 
 * Fix only one sentinel client reconnect issue

data/lib/redis-sentinel/client.rb

@@ -36,7 +36,7 @@ class Redis::Client
     alias connect connect_with_sentinel
 
     def sentinel?
-      @master_name && @sentinels_options
+      !!(@master_name && @sentinels_options)
     end
 
     def auto_retry_with_timeout(&block)
@@ -59,10 +59,10 @@ class Redis::Client
     end
 
     def refresh_sentinels_list
-      responses = current_sentinel.sentinel("sentinels", @master_name)
-      @sentinels_options = responses.map do |response|
-        {:host => response[3], :port => response[5]}
-      end.unshift(:host => current_sentinel.host, :port => current_sentinel.port)
+      current_sentinel.sentinel("sentinels", @master_name).each do |response|
+        @sentinels_options << {:host => response[3], :port => response[5]}
+      end
+      @sentinels_options.uniq! {|h| h.values_at(:host, :port) }
     end
 
     def discover_master
@@ -79,8 +79,8 @@ class Redis::Client
           else
             # A null reply
           end
-        rescue Redis::CommandError
-          # An -IDONTKNOWN reply
+        rescue Redis::CommandError => e
+          raise unless e.message.include?("IDONTKNOW")
         rescue Redis::CannotConnectError
           # faile to connect to current sentinel server
         end
@@ -120,14 +120,16 @@ class Redis::Client
       return if options.nil?
 
       sentinel_options = []
-      options.each do |sentinel_option|
-        if sentinel_option.is_a?(Hash)
-          sentinel_options << sentinel_option
+      options.each do |opts|
+        opts = opts[:url] if opts.is_a?(Hash) && opts.key?(:url)
+        case opts
+        when Hash
+          sentinel_options << opts
         else
-          uri = URI.parse(sentinel_option)
+          uri = URI.parse(opts)
           sentinel_options << {
-              host: uri.host,
-              port: uri.port
+            host: uri.host,
+            port: uri.port
           }
         end
       end

data/lib/redis-sentinel/version.rb

@@ -1,5 +1,5 @@
 class Redis
   module Sentinel
-    VERSION = "1.4.1"
+    VERSION = "1.4.2"
   end
 end

data/spec/redis-sentinel/client_spec.rb

@@ -2,12 +2,13 @@ require "spec_helper"
 
 describe Redis::Client do
   let(:client) { double("Client", :reconnect => true) }
-  let(:current_sentinel)  { double("Redis", :client => client, :host => "localhost", :port => 26379) }
+  let(:current_sentinel)  { double("Redis", :client => client) }
 
   let(:sentinels) do
     [
       { :host => "localhost", :port => 26379 },
-      'sentinel://localhost:26380'
+      'sentinel://localhost:26380',
+      { :url => 'sentinel://localhost:26381' },
     ]
   end
 
@@ -16,6 +17,16 @@ describe Redis::Client do
 
   before { allow(Redis).to receive(:new).and_return(current_sentinel) }
 
+  context "new instances" do
+    it "should parse sentinel options" do
+      expect(subject.instance_variable_get(:@sentinels_options)).to eq [
+        {:host=>"localhost", :port=>26379},
+        {:host=>"localhost", :port=>26380},
+        {:host=>"localhost", :port=>26381}
+      ]
+    end
+  end
+
   context "#sentinel?" do
     it "should be true if passing sentiels and master_name options" do
       expect(subject).to be_sentinel
@@ -57,13 +68,15 @@ describe Redis::Client do
       allow(subject).to receive(:current_sentinel).and_return(current_sentinel)
       expect(current_sentinel).to receive(:sentinel).with("sentinels", "master").and_return([
         ["name", "localhost:26381", "ip", "localhost", "port", 26380],
-        ["name", "localhost:26381", "ip", "localhost", "port", 26381]
+        ["name", "localhost:26381", "ip", "localhost", "port", 26381],
+        ["name", "localhost:26381", "ip", "localhost", "port", 26382],
       ])
       subject.refresh_sentinels_list
       expect(subject.instance_variable_get(:@sentinels_options)).to eq [
         {:host => "localhost", :port => 26379},
         {:host => "localhost", :port => 26380},
-        {:host => "localhost", :port => 26381}
+        {:host => "localhost", :port => 26381},
+        {:host => "localhost", :port => 26382},
       ]
     end
   end
@@ -90,6 +103,19 @@ describe Redis::Client do
       expect(subject.port).to eq 8888
     end
 
+    it "selects next sentinel if sentinel doesn't know" do
+      expect(current_sentinel).to receive(:sentinel).with("get-master-addr-by-name", "master").and_raise(Redis::CommandError.new("IDONTKNOW: No idea"))
+      expect(current_sentinel).to receive(:sentinel).with("get-master-addr-by-name", "master").and_return(["master", 8888])
+      subject.discover_master
+      expect(subject.host).to eq "master"
+      expect(subject.port).to eq 8888
+    end
+
+    it "raises error if try_next_sentinel raises error" do
+      expect(current_sentinel).to receive(:sentinel).with("get-master-addr-by-name", "master").and_raise(Redis::CommandError.new("ERR: No such command"))
+      expect { subject.discover_master }.to raise_error(Redis::CommandError)
+    end
+
     it "raises error if try_next_sentinel raises error" do
       expect(subject).to receive(:try_next_sentinel).and_raise(Redis::CannotConnectError)
       expect { subject.discover_master }.to raise_error(Redis::CannotConnectError)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-sentinel
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: another redis automatic master/slave failover solution for ruby by using