remove duplicate of duplicate

Author: sanderegg

packages/service-library/src/servicelib/redis/_client.py

@@ -10,6 +10,7 @@
 from redis.asyncio.lock import Lock
 from redis.asyncio.retry import Retry
 from redis.backoff import ExponentialBackoff
+from servicelib.async_utils import cancel_wait_task
 from tenacity import retry
 from yarl import URL
 
@@ -20,9 +21,9 @@
     DEFAULT_HEALTH_CHECK_INTERVAL,
     DEFAULT_LOCK_TTL,
     DEFAULT_SOCKET_TIMEOUT,
+    SHUTDOWN_TIMEOUT_S,
 )
 from ._errors import CouldNotConnectToRedisError
-from ._utils import cancel_or_warn
 
 _logger = logging.getLogger(__name__)
 
@@ -82,7 +83,9 @@ async def setup(self) -> None:
     async def shutdown(self) -> None:
         if self._health_check_task:
             self._continue_health_checking = False
-            await cancel_or_warn(self._health_check_task)
+            await cancel_wait_task(
+                self._health_check_task, max_delay=SHUTDOWN_TIMEOUT_S
+            )
             self._health_check_task = None
 
         await self._client.aclose(close_connection_pool=True)

packages/service-library/src/servicelib/redis/_utils.py

@@ -1,4 +1,3 @@
-import asyncio
 import logging
 from collections.abc import Awaitable
 from typing import Any
@@ -7,21 +6,11 @@
 from redis.asyncio.lock import Lock
 
 from ..logging_utils import log_context
-from ._constants import SHUTDOWN_TIMEOUT_S
 from ._errors import LockLostError
 
 _logger = logging.getLogger(__name__)
 
 
-async def cancel_or_warn(task: asyncio.Task) -> None:
-    if not task.cancelled():
-        task.cancel()
-    _, pending = await asyncio.wait((task,), timeout=SHUTDOWN_TIMEOUT_S)
-    if pending:
-        task_name = task.get_name()
-        _logger.warning("Could not cancel task_name=%s pending=%s", task_name, pending)
-
-
 async def auto_extend_lock(lock: Lock) -> None:
     try:
         with log_context(_logger, logging.DEBUG, f"Autoextend lock {lock.name!r}"):