fix connect_to args

Author: agnesnatasya

redis/asyncio/sentinel.py

@@ -56,9 +56,16 @@ async def connect_to(self, address):
             if str_if_bytes(await self.read_response()) != "PONG":
                 raise ConnectionError("PING failed")
 
-    async def _connect_retry(self):
+    async def _connect_retry(self, same_address: bool = False):
         if self._reader:
             return  # already connected
+        # If same_server is True, it means that the connection
+        # is not rotating to the next slave (if the connection pool is not master)
+        if same_address:
+            self.connect_to(self.host, self.port)
+            return
+        # If same_server is False, connnect to master in master mode  
+        # and rotate to the next slave in slave mode
         if self.connection_pool.is_master:
             await self.connect_to(await self.connection_pool.get_master_address())
         else:
@@ -75,22 +82,6 @@ async def connect(self):
             lambda error: asyncio.sleep(0),
         )
 
-    async def _connect_to_address_retry(self, host: str, port: int) -> None:
-        if self._reader:
-            return  # already connected
-        try:
-            return await self.connect_to((host, port))
-        except ConnectionError:
-            raise SlaveNotFoundError
-
-    async def connect_to_address(self, host: str, port: int) -> None:
-        # Connect to the specified host and port
-        # instead of connecting to the master / rotated slaves
-        return await self.retry.call_with_retry(
-            lambda: self._connect_to_address_retry(host, port),
-            lambda error: asyncio.sleep(0),
-        )
-
     async def connect_to_same_address(self):
         """
         Similar to connect, but instead of rotating to the next slave (if not in master mode),
@@ -274,7 +265,7 @@ async def get_connection(
                 host=server_host, port=server_port
             )
             # If not, make a new dummy connection object, and set its host and
-            # port to the one that we want later in the call to ``connect_to_address``
+            # port to the one that we want later in the call to ``connect_to_same_address``
             if not connection:
                 connection = self.make_connection()
         assert connection
@@ -289,7 +280,7 @@ async def get_connection(
             # connect to the previous replica.
             # This will connect to the host and port of the replica
             else:
-                await connection.connect_to_address(server_host, server_port)
+                await connection.connect_to_same_address()
             self.ensure_connection_connected_to_address(connection)
         except BaseException:
             # Release the connection back to the pool so that we don't

redis/sentinel.py

@@ -47,7 +47,7 @@ def _connect_retry(self, same_address: bool = False):
         # If same_server is True, it means that the connection
         # is not rotating to the next slave (if the connection pool is not master)
         if same_address:
-            self.connect_to(self.host, self.port)
+            self.connect_to((self.host, self.port))
             return
         # If same_server is False, connnect to master in master mode  
         # and rotate to the next slave in slave mode
@@ -297,7 +297,7 @@ def get_connection(
                 host=server_host, port=server_port
             )
             # If not, make a new dummy connection object, and set its host and port
-            # to the one that we want later in the call to ``connect_to_address``
+            # to the one that we want later in the call to ``connect_to_same_address``
             if not connection:
                 connection = self.make_connection()
         assert connection
@@ -312,7 +312,7 @@ def get_connection(
             # connect to the previous replica.
             # This will connect to the host and port of the replica
             else:
-                connection.connect_to_address(server_host, server_port)
+                connection.connect_to_same_address()
             self.ensure_connection_connected_to_address(connection)
         except BaseException:
             # Release the connection back to the pool so that we don't

tests/test_asyncio/test_sentinel_managed_connection.py

@@ -43,9 +43,8 @@ async def mock_connect():
 
 
 class SentinelManagedConnectionMock(SentinelManagedConnection):
-    async def connect_to_address(self, host: str, port: int) -> None:
-        self.host = host
-        self.port = port
+    async def connect_to_same_address(self) -> None:
+        pass
 
     async def can_read_destructive(self) -> bool:
         # Mock this function to always return False.

tests/test_sentinel_managed_connection.py

@@ -42,9 +42,8 @@ async def mock_connect():
 
 
 class SentinelManagedConnectionMock(SentinelManagedConnection):
-    def connect_to_address(self, host: str, port: int) -> None:
-        self.host = host
-        self.port = port
+    def connect_to_same_address(self) -> None:
+        pass
 
     def can_read_destructive(self) -> bool:
         # Mock this function to always return False.