redis-sentinel 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0abad2c1cbcc6e342c7f362b9d6c6ad6ebca6a81
-  data.tar.gz: e300689d63cec3fec3f9d2ace82d61d828baf4b3
+  metadata.gz: 20c20d9586d8c9751e1ec9e9dff72133a6c07854
+  data.tar.gz: 9d5e482d914cc224b46061a846468c285368b85a
 SHA512:
-  metadata.gz: 5472ab6c41d452eb5550ed58698871956a57deb51d354c95e154d768b4390871f3f302170ac03987029ad02a5973a471864e4034d2e0195385b9f4f6839d667f
-  data.tar.gz: 4c781a86527902cfc4a9fee13b7b0139b39245eadb894f98647e2f3e0a158c5d5128d2218577830b1b1d0d22df963126a7c1f376522952eb1c1501e0f960eb59
+  metadata.gz: e0f05568866ee3a20d2ed22784fd93488e7ad00a9f41064973eee7e561a98463cc5f802466bb1f2e568a7caf9b22556c0a2ecbb34c29ecda406a59c8e4354eb0
+  data.tar.gz: 0a0e3dd641a640f9819f1aa84ca63a45e6c9aca77e874c21abc6f0a1cc182456bd5c4ad504561306d31f8ad1797e73ab0fded4445356d61347ae7e8b46006805

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.4.1
+
+* Fix only one sentinel client reconnect issue
+
 ## 1.4.0
 
 * Rewrite sentinel client to follow http://redis.io/topics/sentinel

data/lib/redis-sentinel/client.rb

@@ -5,7 +5,6 @@ class Redis::Client
 
   class_eval do
     attr_reader :current_sentinel
-    attr_reader :current_sentinel_options
 
     def initialize_with_sentinel(options={})
       options = options.dup # Don't touch my options
@@ -53,20 +52,17 @@ class Redis::Client
 
     def try_next_sentinel
       sentinel_options = @sentinels_options.shift
-      if sentinel_options
-        @logger.debug "Trying next sentinel: #{sentinel_options[:host]}:#{sentinel_options[:port]}" if @logger && @logger.debug?
-        @current_sentinel_options = sentinel_options
-        @current_sentinel = Redis.new sentinel_options
-      else
-        raise Redis::CannotConnectError
-      end
+      @sentinels_options.push sentinel_options
+
+      @logger.debug "Trying next sentinel: #{sentinel_options[:host]}:#{sentinel_options[:port]}" if @logger && @logger.debug?
+      @current_sentinel = Redis.new sentinel_options
     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_options[:host], :port => current_sentinel_options[:port])
+      end.unshift(:host => current_sentinel.host, :port => current_sentinel.port)
     end
 
     def discover_master

data/lib/redis-sentinel/version.rb

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

data/spec/redis-sentinel/client_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Redis::Client do
   let(:client) { double("Client", :reconnect => true) }
-  let(:redis)  { double("Redis", :sentinel => ["remote.server", 8888], :client => client) }
+  let(:current_sentinel)  { double("Redis", :client => client, :host => "localhost", :port => 26379) }
 
   let(:sentinels) do
     [
@@ -14,9 +14,7 @@ describe Redis::Client do
   subject { Redis::Client.new(:master_name => "master", :master_password => "foobar",
                               :sentinels => sentinels) }
 
-  before do
-    allow(Redis).to receive(:new).and_return(redis)
-  end
+  before { allow(Redis).to receive(:new).and_return(current_sentinel) }
 
   context "#sentinel?" do
     it "should be true if passing sentiels and master_name options" do
@@ -50,25 +48,14 @@ describe Redis::Client do
 
   context "#try_next_sentinel" do
     it "returns next sentinel server" do
-      expect(Redis).to receive(:new).with(:host => "localhost", :port => 26379).and_return(redis)
-      subject.try_next_sentinel
-    end
-
-    it "raises an error if no available sentinel server" do
-      client = Redis::Client.new(
-        :master_name => "master",
-        :sentinels => []
-      )
-      expect { client.try_next_sentinel }.to raise_error(Redis::CannotConnectError)
+      expect(subject.try_next_sentinel).to eq current_sentinel
     end
   end
 
   context "#refresh_sentinels_list" do
     it "gets all sentinels list" do
-      sentinel = double('sentinel')
-      allow(subject).to receive(:current_sentinel_options).and_return(:host => "localhost", :port => 26379)
-      expect(subject).to receive(:current_sentinel).and_return(sentinel)
-      expect(sentinel).to receive(:sentinel).with("sentinels", "master").and_return([
+      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]
       ])
@@ -82,21 +69,22 @@ describe Redis::Client do
   end
 
   context "#discover_master" do
+    before do
+      allow(subject).to receive(:try_next_sentinel)
+      allow(subject).to receive(:refresh_sentinels_list)
+      allow(subject).to receive(:current_sentinel).and_return(current_sentinel)
+    end
+
     it "updates master config options" do
-      expect(redis).to receive(:sentinel).with("get-master-addr-by-name", "master").and_return(["master", 8888])
-      expect(redis).to receive(:sentinel).with("sentinels", "master").and_return([{:host => "sentinel", :port => 8888}])
+      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 "selects next sentinel if failed to connect to current_sentinel" do
-      expect(subject).to receive(:current_sentinel).and_return(redis)
-      expect(redis).to receive(:sentinel).with("get-master-addr-by-name", "master").and_raise(Redis::CannotConnectError)
-      sentinel = double('sentinel')
-      expect(subject).to receive(:current_sentinel).and_return(sentinel)
-      expect(sentinel).to receive(:sentinel).with("get-master-addr-by-name", "master").and_return(["master", 8888])
-      allow(subject).to receive(:refresh_sentinels_list)
+      expect(current_sentinel).to receive(:sentinel).with("get-master-addr-by-name", "master").and_raise(Redis::CannotConnectError)
+      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
@@ -114,9 +102,9 @@ describe Redis::Client do
 
       it "does not sleep" do
         expect(subject).not_to receive(:sleep)
-        expect do
+        expect {
           subject.auto_retry_with_timeout { raise Redis::CannotConnectError }
-        end.to raise_error(Redis::CannotConnectError)
+        }.to raise_error(Redis::CannotConnectError)
       end
     end
 
@@ -176,10 +164,7 @@ describe Redis::Client do
 
   context "#disconnect" do
     it "calls disconnect on each sentinel client" do
-      sentinel = double('sentinel')
-      client = double('client')
-      allow(subject).to receive(:current_sentinel).and_return(sentinel)
-      expect(sentinel).to receive(:client).and_return(client)
+      allow(subject).to receive(:current_sentinel).and_return(current_sentinel)
       expect(client).to receive(:disconnect)
       subject.disconnect
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-sentinel
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis