add is_supported_error() to retry

redis/cluster.py

@@ -1103,7 +1103,7 @@ def execute_command(self, *args, **kwargs):
                     # The nodes and slots cache were reinitialized.
                     # Try again with the new cluster setup.
                     retry_attempts -= 1
-                    if self.retry and isinstance(e, self.retry._supported_errors):
+                    if self.retry and self.retry.is_supported_error(e):
                         backoff = self.retry._backoff.compute(
                             self.cluster_error_retry_attempts - retry_attempts
                         )
@@ -2039,9 +2039,7 @@ def _send_cluster_commands(
                                 n.connection_pool.release(n.connection)
                                 n.connection = None
                             nodes = {}
-                            if self.retry and isinstance(
-                                e, self.retry._supported_errors
-                            ):
+                            if self.retry and self.retry.is_supported_error(e):
                                 backoff = self.retry._backoff.compute(attempts_count)
                                 if backoff > 0:
                                     time.sleep(backoff)

redis/retry.py

@@ -32,6 +32,9 @@ def update_supported_errors(self, specified_errors: list):
             set(self._supported_errors + tuple(specified_errors))
         )
 
+    def is_supported_error(self, error):
+        return isinstance(error, self._supported_errors)
+
     def call_with_retry(self, do, fail):
         """
         Execute an operation that might fail and returns its result, or

tests/test_retry.py

@@ -9,6 +9,8 @@
     BusyLoadingError,
     ConnectionError,
     ReadOnlyError,
+    RedisClusterException,
+    RedisError,
     TimeoutError,
 )
 from redis.retry import Retry
@@ -122,6 +124,16 @@ def test_infinite_retry(self):
         assert self.actual_attempts == 5
         assert self.actual_failures == 5
 
+    @pytest.mark.parametrize("exception_class", [ConnectionError, TimeoutError])
+    def test_is_supported_error_true(self, exception_class):
+        retry = Retry(BackoffMock(), -1)
+        assert retry.is_supported_error(exception_class())
+
+    @pytest.mark.parametrize("exception_class", [RedisClusterException, RedisError])
+    def test_is_supported_error_false(self, exception_class):
+        retry = Retry(BackoffMock(), -1)
+        assert not retry.is_supported_error(exception_class())
+
 
 @pytest.mark.onlynoncluster
 class TestRedisClientRetry: