Cancel setup task on node removal

home-assistant-libs · Sep 4, 2024 · 69a20c4 · 69a20c4
1 parent 66faa0b
commit 69a20c4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/matter_server/server/device_controller.py b/matter_server/server/device_controller.py
@@ -769,6 +769,9 @@ async def remove_node(self, node_id: int) -> None:
 
         LOGGER.info("Removing Node ID %s.", node_id)
 
+        if task := self._setup_node_with_retry_tasks.pop(node_id, None):
+            task.cancel()
+
         # shutdown any existing subscriptions
         await self._chip_device_controller.shutdown_subscription(node_id)
         self._polled_attributes.pop(node_id, None)