jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-18 18:57:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid creating tasks to remove entities (#110967)

Browse Source
This commit is contained in:
J. Nick Koston 2024-02-20 21:32:36 -06:00 committed by GitHub
parent db77e73a76
commit 1a02330bd9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
homeassistant/helpers/entity.py
View File

@ -532,7 +532,7 @@ class Entity(
__capabilities_updated_at: deque[float] __capabilities_updated_at: deque[float]
__capabilities_updated_at_reported: bool = False __capabilities_updated_at_reported: bool = False
__remove_event: asyncio.Event | None = None __remove_future: asyncio.Future[None] | None = None
# Entity Properties # Entity Properties
_attr_assumed_state: bool = False _attr_assumed_state: bool = False
@ -1338,15 +1338,18 @@ class Entity(
If the entity doesn't have a non disabled entry in the entity registry, If the entity doesn't have a non disabled entry in the entity registry,
or if force_remove=True, its state will be removed. or if force_remove=True, its state will be removed.
""" """
if self.__remove_event is not None: if self.__remove_future is not None:
await self.__remove_event.wait() await self.__remove_future
return return
self.__remove_event = asyncio.Event() self.__remove_future = self.hass.loop.create_future()
try: try:
await self.__async_remove_impl(force_remove) await self.__async_remove_impl(force_remove)
except BaseException as ex:
self.__remove_future.set_exception(ex)
raise
finally: finally:
self.__remove_event.set() self.__remove_future.set_result(None)
@final @final
async def __async_remove_impl(self, force_remove: bool) -> None: async def __async_remove_impl(self, force_remove: bool) -> None:
@ -1496,8 +1499,8 @@ class Entity(
self.entity_id = registry_entry.entity_id self.entity_id = registry_entry.entity_id
# Clear the remove event to handle entity added again after entity id change # Clear the remove future to handle entity added again after entity id change
self.__remove_event = None self.__remove_future = None
self._platform_state = EntityPlatformState.NOT_ADDED self._platform_state = EntityPlatformState.NOT_ADDED
await self.platform.async_add_entities([self]) await self.platform.async_add_entities([self])

14
homeassistant/helpers/entity_platform.py
View File

@ -792,9 +792,17 @@ class EntityPlatform:
if not self.entities: if not self.entities:
return return
tasks = [entity.async_remove() for entity in self.entities.values()] # Removals are awaited in series since in most
# cases calling async_remove will not yield control
await asyncio.gather(*tasks) # 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.async_unsub_polling()
self._setup_complete = False self._setup_complete = False