cleanup in sync client

Author: agnesnatasya

redis/client.py

@@ -581,6 +581,9 @@ def execute_command(self, *args, **options):
         finally:
             if not self.connection:
                 pool.release(conn)
+            if "SCAN" in command_name.upper():
+                breakpoint()
+                pool.cleanup(iter_req_id=options.get("_iter_req_id", None))
 
     def parse_response(self, connection, command_name, **options):
         """Parses a response from the Redis server"""

redis/sentinel.py

@@ -261,6 +261,7 @@ def cleanup(self, **options):
         """
         Remove the SCAN ITER family command's request id from the dictionary
         """
+        breakpoint()
         self._iter_req_id_to_replica_address.pop(
             options.get("_iter_req_id", None), None
         )

tests/test_sentinel_managed_connection.py

@@ -213,7 +213,10 @@ def test_scan_iter_family_cleans_up(
     """Test that connection pool is correctly cleaned up"""
     from redis import Redis
 
-    r = Redis(connection_pool=connection_pool_replica_mock)
+    from redis.commands.core import ScanCommands
 
-    [k for k in r.scan_iter("a")]
+    r = Redis(connection_pool=connection_pool_replica_mock)
+    with mock.patch.object(r, "_send_command_parse_response", return_value=(0, [])):
+        [k for k in r.scan_iter("a")]
     assert not connection_pool_replica_mock._iter_req_id_to_replica_address
+