diff options
author | Eric Lemoine <eric.lemoine@getalma.eu> | 2022-06-19 03:56:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-19 04:56:53 +0300 |
commit | bea72995fd39b01e2f0a1682b16b6c7690933f36 (patch) | |
tree | 477b9093e9664a13add96681a2012ded0ffbc798 /redis/asyncio/client.py | |
parent | 33702983b8b0a55d29189babb631ea108ee8404f (diff) | |
download | redis-py-bea72995fd39b01e2f0a1682b16b6c7690933f36.tar.gz |
Fix retries in async mode (#2180)
* Avoid mutating a global retry_on_error list
* Make retries config consistent in sync and async
* Fix async retries
* Add new TestConnectionConstructorWithRetry tests
Diffstat (limited to 'redis/asyncio/client.py')
-rw-r--r-- | redis/asyncio/client.py | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/redis/asyncio/client.py b/redis/asyncio/client.py index 6db5489..3d59016 100644 --- a/redis/asyncio/client.py +++ b/redis/asyncio/client.py @@ -158,6 +158,7 @@ class Redis( encoding_errors: str = "strict", decode_responses: bool = False, retry_on_timeout: bool = False, + retry_on_error: Optional[list] = None, ssl: bool = False, ssl_keyfile: Optional[str] = None, ssl_certfile: Optional[str] = None, @@ -176,8 +177,10 @@ class Redis( ): """ Initialize a new Redis client. - To specify a retry policy, first set `retry_on_timeout` to `True` - then set `retry` to a valid `Retry` object + To specify a retry policy for specific errors, first set + `retry_on_error` to a list of the error/s to retry on, then set + `retry` to a valid `Retry` object. + To retry on TimeoutError, `retry_on_timeout` can also be set to `True`. """ kwargs: Dict[str, Any] # auto_close_connection_pool only has an effect if connection_pool is @@ -188,6 +191,10 @@ class Redis( auto_close_connection_pool if connection_pool is None else False ) if not connection_pool: + if not retry_on_error: + retry_on_error = [] + if retry_on_timeout is True: + retry_on_error.append(TimeoutError) kwargs = { "db": db, "username": username, @@ -197,6 +204,7 @@ class Redis( "encoding_errors": encoding_errors, "decode_responses": decode_responses, "retry_on_timeout": retry_on_timeout, + "retry_on_error": retry_on_error, "retry": copy.deepcopy(retry), "max_connections": max_connections, "health_check_interval": health_check_interval, @@ -461,7 +469,10 @@ class Redis( is not a TimeoutError """ await conn.disconnect() - if not (conn.retry_on_timeout and isinstance(error, TimeoutError)): + if ( + conn.retry_on_error is None + or isinstance(error, tuple(conn.retry_on_error)) is False + ): raise error # COMMAND EXECUTION AND PROTOCOL PARSING |