Kristjan/issue redis#2754: Add missing argument to SentinelManagedCon…

…nection.read_response() (redis#2756)

* Increase timeout for a test which would hang completely if failing.
Timeouts in virtualized CI backends can occasionally fail if too short.

* add "disconnect_on_error" argument to SentinelManagedConnection

* update Changes

* lint

CHANGES

@@ -1,3 +1,4 @@
+ * Fix #2754, adding a missing argument to SentinelManagedConnection
  * Fix `xadd` command to accept non-negative `maxlen` including 0
  * Revert #2104, #2673, add `disconnect_on_error` option to `read_response()` (issues #2506, #2624)
  * Add `address_remap` parameter to `RedisCluster`

redis/asyncio/sentinel.py

@@ -67,11 +67,14 @@ async def read_response(
  self,
  disable_decoding: bool = False,
  timeout: Optional[float] = None,
+ *,
+ disconnect_on_error: Optional[float] = True,
  ):
  try:
  return await super().read_response(
  disable_decoding=disable_decoding,
  timeout=timeout,
+ disconnect_on_error=disconnect_on_error,
  )
  except ReadOnlyError:
  if self.connection_pool.is_master:

redis/sentinel.py

@@ -1,5 +1,6 @@
 import random
 import weakref
+from typing import Optional
 
 from redis.client import Redis
 from redis.commands import SentinelCommands
@@ -53,9 +54,14 @@ def _connect_retry(self):
  def connect(self):
  return self.retry.call_with_retry(self._connect_retry, lambda error: None)
 
- def read_response(self, disable_decoding=False):
+ def read_response(
+ self, disable_decoding=False, *, disconnect_on_error: Optional[bool] = False
+ ):
  try:
- return super().read_response(disable_decoding=disable_decoding)
+ return super().read_response(
+ disable_decoding=disable_decoding,
+ disconnect_on_error=disconnect_on_error,
+ )
  except ReadOnlyError:
  if self.connection_pool.is_master:
  # When talking to a master, a ReadOnlyError when likely

tests/test_asyncio/test_commands.py

@@ -3051,7 +3051,7 @@ async def helper():
  # the task is now sleeping, lets send it an exception
  task.cancel()
  # If all is well, the task should finish right away, otherwise fail with Timeout
- async with async_timeout(0.1):
+ async with async_timeout(1.0):
  await task