Avoid creating tasks to remove entities

homeassistant/helpers/entity.py

@@ -532,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
@@ -1338,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:
@@ -1496,8 +1499,8 @@ async def _async_process_registry_update_or_remove(
 
         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

@@ -792,9 +792,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