Merge "Use a sentinel connection pool to manage failover" into stable/kilo0.13.2

1 files changed, 5 insertions, 4 deletions

diff --git a/tooz/drivers/redis.py b/tooz/drivers/redis.py
index f52d36a..6ae7c46 100644
--- a/tooz/drivers/redis.py
+++ b/tooz/drivers/redis.py
@@ -348,13 +348,14 @@ class RedisDriver(coordination.CoordinationDriver):
             sentinel_server = sentinel.Sentinel(
                 sentinel_hosts,
                 socket_timeout=kwargs['socket_timeout'])
-            master_host, master_port = sentinel_server.discover_master(
-                kwargs['sentinel'])
-            kwargs['host'] = master_host
-            kwargs['port'] = master_port
+            sentinel_name = kwargs['sentinel']
             del kwargs['sentinel']
             if 'sentinel_fallback' in kwargs:
                 del kwargs['sentinel_fallback']
+            master_client = sentinel_server.master_for(sentinel_name, **kwargs)
+            # The master_client is a redis.StrictRedis using a
+            # Sentinel managed connection pool.
+            return master_client
         return redis.StrictRedis(**kwargs)
 
     def _start(self):