Fix PR feedback

Author: abrookins

redis/asyncio/client.py

@@ -605,17 +605,24 @@ async def __aenter__(self: _RedisT) -> _RedisT:
         connection pool is only closed (via aclose()) when no context is using
         the client.
         """
-        async with self._usage_lock:
-            self._usage_counter += 1
+        await self._increment_usage()
         try:
             # Initialize the client (i.e. establish connection, etc.)
             return await self.initialize()
         except Exception:
             # If initialization fails, decrement the counter to keep it in sync
-            async with self._usage_lock:
-                self._usage_counter -= 1
+            await self._decrement_usage()
             raise
 
+    async def _increment_usage(self) -> int:
+        """
+        Helper coroutine to increment the usage counter while holding the lock.
+        Returns the new value of the usage counter.
+        """
+        async with self._usage_lock:
+            self._usage_counter += 1
+            return self._usage_counter
+
     async def _decrement_usage(self) -> int:
         """
         Helper coroutine to decrement the usage counter while holding the lock.

redis/asyncio/cluster.py

@@ -478,17 +478,24 @@ async def __aenter__(self) -> "RedisCluster":
         connection pool is only closed (via aclose()) when no context is using
         the client.
         """
-        async with self._usage_lock:
-            self._usage_counter += 1
+        await self._increment_usage()
         try:
             # Initialize the client (i.e. establish connection, etc.)
             return await self.initialize()
         except Exception:
             # If initialization fails, decrement the counter to keep it in sync
-            async with self._usage_lock:
-                self._usage_counter -= 1
+            await self._decrement_usage()
             raise
 
+    async def _increment_usage(self) -> int:
+        """
+        Helper coroutine to increment the usage counter while holding the lock.
+        Returns the new value of the usage counter.
+        """
+        async with self._usage_lock:
+            self._usage_counter += 1
+            return self._usage_counter
+
     async def _decrement_usage(self) -> int:
         """
         Helper coroutine to decrement the usage counter while holding the lock.