Fix sentinel mode read-write separation

changelog.d/749.bugfix

@@ -0,0 +1 @@
+Fix is_master parsing error for write separation in sentinel mode

django_redis/client/default.py

@@ -328,7 +328,7 @@ def expire(
 
         # for some strange reason mypy complains,
         # saying that timeout type is float | timedelta
-        return client.expire(key, timeout)  # type: ignore
+        return client.expire(key, timeout)
 
     def pexpire(
         self,
@@ -349,7 +349,7 @@ def pexpire(
         # is fixed.
         # for some strange reason mypy complains,
         # saying that timeout type is float | timedelta
-        return bool(client.pexpire(key, timeout))  # type: ignore
+        return bool(client.pexpire(key, timeout))
 
     def pexpire_at(
         self,

django_redis/client/herd.py

@@ -26,9 +26,7 @@ def _is_expired(x, herd_timeout: int) -> bool:
         return True
     val = x + random.randint(1, herd_timeout)
 
-    if val >= herd_timeout:
-        return True
-    return False
+    return val >= herd_timeout
 
 
 class HerdClient(DefaultClient):

django_redis/pool.py

@@ -1,5 +1,5 @@
 from typing import Dict
-from urllib.parse import parse_qs, urlparse
+from urllib.parse import parse_qs, urlencode, urlparse, urlunparse
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
@@ -163,16 +163,27 @@
         # explicitly set service_name and sentinel_manager for the
         # SentinelConnectionPool constructor since will be called by from_url
         cp_params = dict(params)
-        cp_params.update(service_name=url.hostname, sentinel_manager=self._sentinel)
-        pool = super().get_connection_pool(cp_params)
-
         # convert "is_master" to a boolean if set on the URL, otherwise if not
         # provided it defaults to True.
-        is_master = parse_qs(url.query).get("is_master")
+        query_params = parse_qs(url.query)
+        is_master = query_params.get("is_master")
         if is_master:
-            pool.is_master = to_bool(is_master[0])
+            cp_params["is_master"] = to_bool(is_master[0])
+        # then remove the "is_master" query string from the URL
+        # so it doesn't interfere with the SentinelConnectionPool constructor
+        if "is_master" in query_params:
+            del query_params["is_master"]
+        new_query = urlencode(query_params, doseq=True)
+
+        new_url = urlunparse(
+            (url.scheme, url.netloc, url.path, url.params, new_query, url.fragment)
+        )
 
-        return pool
+        cp_params.update(
+            service_name=url.hostname, sentinel_manager=self._sentinel, url=new_url
+        )
+
+        return super().get_connection_pool(cp_params)
 
 
 def get_connection_factory(path=None, options=None):

tests/test_connection_string.py

@@ -8,6 +8,8 @@
     [
         "unix://tmp/foo.bar?db=1",
         "redis://localhost/2",
+        "redis://redis-master/0?is_master=0",
+        "redis://redis-master/2?is_master=False",
         "rediss://localhost:3333?db=2",
     ],
 )