Merge pull request #176 from stanhu/sh-shutdown-redis-sentinel-connection

Close Redis Sentinel connection after resolving role

Author: byroot

lib/redis_client/sentinel_config.rb

@@ -188,6 +188,10 @@ def each_sentinel
           if success
             @sentinel_configs.unshift(@sentinel_configs.delete(sentinel_config))
           end
+          # Redis Sentinels may be configured to have a lower maxclients setting than
+          # the Redis nodes. Close the connection to the Sentinel node to avoid using
+          # a connection.
+          sentinel_client.close
         end
       end
 

test/sentinel/sentinel_test.rb

@@ -50,8 +50,11 @@ def test_sentinel_all_down
     end
 
     class SentinelClientMock
+      attr_reader :close_count
+
       def initialize(responses)
         @responses = responses
+        @close_count = 0
       end
 
       def call(*args)
@@ -66,6 +69,10 @@ def call(*args)
           raise "Expected #{command.inspect}, got: #{args.inspect}"
         end
       end
+
+      def close
+        @close_count += 1
+      end
     end
 
     def test_unknown_master
@@ -184,6 +191,7 @@ def test_successful_connection_refreshes_sentinels_list
       assert_equal Servers::SENTINELS.length + 1, @config.sentinels.length
       assert_equal new_sentinel_ip, @config.sentinels.last.host
       assert_equal new_sentinel_port, @config.sentinels.last.port
+      assert_equal 1, sentinel_client_mock.close_count
     end
 
     def test_sentinel_refresh_password
@@ -211,6 +219,8 @@ def test_sentinel_refresh_password
       @config.sentinels.each do |sentinel|
         refute_nil sentinel.password
       end
+
+      assert_equal 1, sentinel_client_mock.close_count
     end
 
     def test_config_user_password_from_url_for_redis_master_replica_only