Avoid creating tasks to remove entities

homeassistant/helpers/entity.py

@@ -496,6 +496,9 @@ class Entity(
     # Entry in the entity registry
     registry_entry: er.RegistryEntry | None = None
 
+    # If the entity is removed from the entity registry
+    _removed_from_registry: bool = False
+
     # The device entry for this entity
     device_entry: dr.DeviceEntry | None = None
 
@@ -529,7 +532,7 @@ class Entity(
 
     __capabilities_updated_at: deque[float]
     __capabilities_updated_at_reported: bool = False
-    __remove_event: asyncio.Event | None = None
+    __remove_future: asyncio.Future[None] | None = None
 
     # Entity Properties
     _attr_assumed_state: bool = False
@@ -1335,15 +1338,18 @@ async def async_remove(self, *, force_remove: bool = False) -> None:
         If the entity doesn't have a non disabled entry in the entity registry,
         or if force_remove=True, its state will be removed.
         """
-        if self.__remove_event is not None:
-            await self.__remove_event.wait()
+        if self.__remove_future is not None:
+            await self.__remove_future
             return
 
-        self.__remove_event = asyncio.Event()
+        self.__remove_future = self.hass.loop.create_future()
         try:
             await self.__async_remove_impl(force_remove)
+        except BaseException as ex:
+            self.__remove_future.set_exception(ex)
+            raise
         finally:
-            self.__remove_event.set()
+            self.__remove_future.set_result(None)
 
     @final
     async def __async_remove_impl(self, force_remove: bool) -> None:
@@ -1361,6 +1367,8 @@ async def __async_remove_impl(self, force_remove: bool) -> None:
             not force_remove
             and self.registry_entry
             and not self.registry_entry.disabled
+            # Check if entity is still in the entity registry
+            and not self._removed_from_registry
         ):
             # Set the entity's state will to unavailable + ATTR_RESTORED: True
             self.registry_entry.write_unavailable_state(self.hass)
@@ -1430,11 +1438,25 @@ async def async_internal_will_remove_from_hass(self) -> None:
         if self.platform:
             self.hass.data[DATA_ENTITY_SOURCE].pop(self.entity_id)
 
-    async def _async_registry_updated(
+    @callback
+    def _async_registry_updated(
         self, event: EventType[er.EventEntityRegistryUpdatedData]
     ) -> None:
         """Handle entity registry update."""
         data = event.data
+        action = data["action"]
+        is_remove = action == "remove"
+        self._removed_from_registry = is_remove
+        if action == "update" or is_remove:
+            self.hass.async_create_task(
+                self._async_process_registry_update_or_remove(event)
+            )
+
+    async def _async_process_registry_update_or_remove(
+        self, event: EventType[er.EventEntityRegistryUpdatedData]
+    ) -> None:
+        """Handle entity registry update or remove."""
+        data = event.data
         if data["action"] == "remove":
             await self.async_removed_from_registry()
             self.registry_entry = None
@@ -1469,8 +1491,8 @@ async def _async_registry_updated(
 
         self.entity_id = registry_entry.entity_id
 
-        # Clear the remove event to handle entity added again after entity id change
-        self.__remove_event = None
+        # Clear the remove future to handle entity added again after entity id change
+        self.__remove_future = None
         self._platform_state = EntityPlatformState.NOT_ADDED
         await self.platform.async_add_entities([self])
 

homeassistant/helpers/entity_platform.py

@@ -791,9 +791,17 @@ async def async_reset(self) -> None:
         if not self.entities:
             return
 
-        tasks = [entity.async_remove() for entity in self.entities.values()]
-
-        await asyncio.gather(*tasks)
+        # Removals are awaited in series since in most
+        # cases calling async_remove will not yield control
+        # to the event loop and we want to avoid scheduling
+        # one task per entity.
+        for entity in list(self.entities.values()):
+            try:
+                await entity.async_remove()
+            except Exception:  # pylint: disable=broad-except
+                self.logger.exception(
+                    "Error while removing entity %s", entity.entity_id
+                )
 
         self.async_unsub_polling()
         self._setup_complete = False