Fixed that dispatches are never retried, but forever logged.

Signed-off-by: Mathias L. Baumann <[email protected]>

Author: Marenz

RELEASE_NOTES.md

@@ -14,4 +14,4 @@
 
 ## Bug Fixes
 
-<!-- Here goes notable bug fixes that are worth a special mention or explanation -->
+* Fixed that dispatches are never retried on failure, but instead an infinite loop of retry logs is triggered.

src/frequenz/dispatch/_actor_dispatcher.py

@@ -11,6 +11,7 @@
 from typing import Any, Awaitable, cast
 
 from frequenz.channels import Broadcast, Receiver, Sender, select
+from frequenz.channels.timer import SkipMissedAndDrift, Timer
 from frequenz.client.common.microgrid.components import ComponentCategory
 from frequenz.client.microgrid import ComponentId
 from frequenz.sdk.actor import Actor, BackgroundService
@@ -142,59 +143,6 @@ async def main():
     ```
     """
 
-    class FailedDispatchesRetrier(BackgroundService):
-        """Manages the retring of failed dispatches."""
-
-        def __init__(self, retry_interval: timedelta) -> None:
-            """Initialize the retry manager.
-
-            Args:
-                retry_interval: The interval between retries.
-            """
-            super().__init__()
-            self._retry_interval = retry_interval
-            self._channel = Broadcast[Dispatch](name="retry_channel")
-            self._sender = self._channel.new_sender()
-
-        def start(self) -> None:
-            """Start the background service.
-
-            This is a no-op.
-            """
-
-        def new_receiver(self) -> Receiver[Dispatch]:
-            """Create a new receiver for dispatches to retry.
-
-            Returns:
-                The receiver.
-            """
-            return self._channel.new_receiver()
-
-        def retry(self, dispatch: Dispatch) -> None:
-            """Retry a dispatch.
-
-            Args:
-                dispatch: The dispatch information to retry.
-            """
-            task = asyncio.create_task(self._retry_after_delay(dispatch))
-            self._tasks.add(task)
-            task.add_done_callback(self._tasks.remove)
-
-        async def _retry_after_delay(self, dispatch: Dispatch) -> None:
-            """Retry a dispatch after a delay.
-
-            Args:
-                dispatch: The dispatch information to retry.
-            """
-            _logger.info(
-                "Will retry dispatch %s after %s",
-                dispatch.id,
-                self._retry_interval,
-            )
-            await asyncio.sleep(self._retry_interval.total_seconds())
-            _logger.info("Retrying dispatch %s now", dispatch.id)
-            await self._sender.send(dispatch)
-
     @dataclass(frozen=True, kw_only=True)
     class ActorAndChannel:
         """Actor and its sender."""
@@ -225,18 +173,18 @@ def __init__(  # pylint: disable=too-many-arguments, too-many-positional-argumen
             running_status_receiver: The receiver for dispatch running status changes.
             dispatch_identity: A function to identify to which actor a dispatch refers.
                 By default, it uses the dispatch ID.
-            retry_interval: The interval between retries.
+            retry_interval: How long to wait until trying to start failed actors again.
         """
         super().__init__()
         self._dispatch_identity: Callable[[Dispatch], int] = (
             dispatch_identity if dispatch_identity else lambda d: d.id
         )
 
         self._dispatch_rx = running_status_receiver
+        self._retry_timer_rx = Timer(retry_interval, SkipMissedAndDrift())
         self._actor_factory = actor_factory
         self._actors: dict[int, ActorDispatcher.ActorAndChannel] = {}
-
-        self._retrier = ActorDispatcher.FailedDispatchesRetrier(retry_interval)
+        self._pending_dispatches: dict[int, Dispatch] = {}
 
     def start(self) -> None:
         """Start the background service."""
@@ -292,7 +240,7 @@ async def _start_actor(self, dispatch: Dispatch) -> None:
                     dispatch.type,
                     exc_info=e,
                 )
-                self._retrier.retry(dispatch)
+                self._pending_dispatches[identity] = dispatch
             else:
                 # No exception occurred, so we can add the actor to the list
                 self._actors[identity] = ActorDispatcher.ActorAndChannel(
@@ -318,21 +266,35 @@ async def _stop_actor(self, stopping_dispatch: Dispatch, msg: str) -> None:
 
     async def _run(self) -> None:
         """Run the background service."""
-        async with self._retrier:
-            retry_recv = self._retrier.new_receiver()
+        async for selected in select(self._retry_timer_rx, self._dispatch_rx):
+            if self._retry_timer_rx.triggered(selected):
+                if not self._pending_dispatches:
+                    continue
+
+                _logger.info(
+                    "Retrying %d pending dispatches",
+                    len(self._pending_dispatches),
+                )
+                keys = self._pending_dispatches.keys()
+                for identity in keys:
+                    dispatch = self._pending_dispatches[identity]
 
-            async for selected in select(retry_recv, self._dispatch_rx):
-                if retry_recv.triggered(selected):
-                    self._retrier.retry(selected.message)
-                elif self._dispatch_rx.triggered(selected):
-                    await self._handle_dispatch(selected.message)
+                    await self._handle_dispatch(dispatch)
+            elif self._dispatch_rx.triggered(selected):
+                await self._handle_dispatch(selected.message)
 
     async def _handle_dispatch(self, dispatch: Dispatch) -> None:
         """Handle a dispatch.
 
+        Also removes the dispatch from pending dispatches.
+
         Args:
             dispatch: The dispatch to handle.
         """
+        identity = self._dispatch_identity(dispatch)
+        if identity in self._pending_dispatches:
+            self._pending_dispatches.pop(identity)
+
         if dispatch.started:
             await self._start_actor(dispatch)
         else: