Reverted change in test_auth: we'll replace the default node only for…

… commands we allow to retry on
redis · Nov 20, 2022 · 81a29ae · 81a29ae
1 parent f8060b7
commit 81a29ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/redis/cluster.py b/redis/cluster.py
@@ -1057,10 +1057,10 @@ def execute_command(self, *args, **kwargs):
                 # Return the processed result
                 return self._process_result(args[0], res, **kwargs)
             except Exception as e:
-                if is_default_node:
-                    # Replace the default cluster node
-                    self.replace_default_node()
                 if retry_attempts > 0 and type(e) in self.__class__.ERRORS_ALLOW_RETRY:
+                    if is_default_node:
+                        # Replace the default cluster node
+                        self.replace_default_node()
                     # The nodes and slots cache were reinitialized.
                     # Try again with the new cluster setup.
                     retry_attempts -= 1

diff --git a/tests/test_cluster.py b/tests/test_cluster.py
@@ -813,8 +813,6 @@ def raise_connection_error():
         nodes = r.cluster_nodes()
         assert "myself" not in nodes.get(curr_default_node.name).get("flags")
         assert r.get_default_node() != curr_default_node
-        # Rollback to the old default node
-        r.replace_default_node(curr_default_node)
 
 
 @pytest.mark.onlycluster