fix cancelling code

Author: sanderegg

packages/common-library/src/common_library/async_tools.py

@@ -89,15 +89,26 @@ async def cancel_wait_task(
         TimeoutError: raised if cannot cancel the task.
         CancelledError: raised ONLY if owner is being cancelled.
     """
+    if task.done():
+        # nothing to do here
+        return
+
+    # mark for cancellation
     task.cancel("cancel_wait_task was called to cancel this task")
     try:
-        _logger.debug("%s", f"Cancelling task {task.get_name()!r}")
+        _logger.debug("Cancelling task %s", task.get_name())
         await asyncio.shield(
             # NOTE shield ensures that cancellation of the caller function won't stop you
             # from observing the cancellation/finalization of task.
             asyncio.wait_for(task, timeout=max_delay)
         )
-
+    except TimeoutError:
+        _logger.exception(
+            "Timeout while cancelling task %s after %s seconds",
+            task.get_name(),
+            max_delay,
+        )
+        raise
     except asyncio.CancelledError:
         current_task = asyncio.current_task()
         assert current_task is not None  # nosec
@@ -108,7 +119,7 @@ async def cancel_wait_task(
         if not task.done():
             _logger.error("Failed to cancel %s", task.get_name())
         else:
-            _logger.debug("%s", f"Task {task.get_name()!r} cancelled")
+            _logger.debug("Task %s cancelled", task.get_name())
 
 
 def delayed_start(