Skip to content

Fix race in entity_platform.async_add_entities #19222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 1 commit into from
Dec 14, 2018
Merged

Fix race in entity_platform.async_add_entities #19222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion homeassistant/helpers/entity_platform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,8 @@ async def _async_add_entity(self, entity, update_before_add,
self.domain, self.platform_name, entity.unique_id,
suggested_object_id=suggested_object_id,
config_entry_id=config_entry_id,
device_id=device_id)
device_id=device_id,
known_object_ids=self.entities.keys())

if entry.disabled:
self.logger.info(
Expand Down
5 changes: 3 additions & 2 deletions homeassistant/helpers/entity_registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def async_generate_entity_id(self, domain, suggested_object_id,
@callback
def async_get_or_create(self, domain, platform, unique_id, *,
suggested_object_id=None, config_entry_id=None,
device_id=None):
device_id=None, known_object_ids=None):
"""Get entity. Create if it doesn't exist."""
entity_id = self.async_get_entity_id(domain, platform, unique_id)
if entity_id:
Expand All @@ -126,7 +126,8 @@ def async_get_or_create(self, domain, platform, unique_id, *,
device_id=device_id)

entity_id = self.async_generate_entity_id(
domain, suggested_object_id or '{}_{}'.format(platform, unique_id))
domain, suggested_object_id or '{}_{}'.format(platform, unique_id),
known_object_ids)

entity = RegistryEntry(
entity_id=entity_id,
Expand Down